From 03e574fd3e8dee3c2286cb48692cced6c8589f48 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Wed, 4 Dec 2019 08:24:05 +0000
Subject: [PATCH] Update web-platform-tests to revision
 54a6679265caf957a1470c2b398a81bd5440dd2f

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../FileAPI/url/url-with-fetch.any.js.ini     |    3 -
 tests/wpt/metadata/MANIFEST.json              | 3804 +++++++++--------
 .../css/cssom/cssimportrule-parent.html.ini   |    4 +
 .../cssimportrule-sheet-identity.html.ini     |    4 +
 .../fetch/content-type/response.window.js.ini |   20 +-
 .../fetch/content-type/script.window.js.ini   |    6 -
 .../nosniff/parsing-nosniff.window.js.ini     |    2 +-
 .../traverse_the_history_1.html.ini           |    4 -
 ...creating_browsing_context_test_01.html.ini |    4 -
 ...s-negative-innerwidth-innerheight.html.ini |   19 +
 ...features-negative-screenx-screeny.html.ini |   19 +
 .../open-features-negative-top-left.html.ini  |   19 +
 ...en-features-negative-width-height.html.ini |   19 +
 .../open-features-non-integer-height.html.ini |   34 +-
 ...-features-non-integer-innerheight.html.ini |   28 +-
 ...n-features-non-integer-innerwidth.html.ini |   28 +-
 .../open-features-non-integer-left.html.ini   |   28 +-
 ...open-features-non-integer-screenx.html.ini |   28 +-
 ...open-features-non-integer-screeny.html.ini |   28 +-
 .../open-features-non-integer-top.html.ini    |   28 +-
 .../open-features-non-integer-width.html.ini  |   34 +-
 ...cess_feature_policy.tentative.sub.html.ini |    7 -
 .../supported-elements.html.ini               |   12 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 .../script-onerror-insertion-point-2.html.ini |    2 +
 .../2d.composite.canvas.copy.html.ini         |    4 +
 .../2d.composite.canvas.copy.worker.js.ini    |    4 +
 ...composite.canvas.destination-atop.html.ini |    4 +
 ...site.canvas.destination-atop.worker.js.ini |    4 +
 ...d.composite.canvas.destination-in.html.ini |    4 +
 ...posite.canvas.destination-in.worker.js.ini |    4 +
 ....composite.canvas.destination-out.html.ini |    4 +
 ...osite.canvas.destination-out.worker.js.ini |    4 +
 ...composite.canvas.destination-over.html.ini |    4 +
 ...site.canvas.destination-over.worker.js.ini |    4 +
 .../2d.composite.canvas.lighter.html.ini      |    4 +
 .../2d.composite.canvas.lighter.worker.js.ini |    4 +
 .../2d.composite.canvas.source-atop.html.ini  |    4 +
 ...composite.canvas.source-atop.worker.js.ini |    4 +
 .../2d.composite.canvas.source-in.html.ini    |    4 +
 ...d.composite.canvas.source-in.worker.js.ini |    4 +
 .../2d.composite.canvas.source-out.html.ini   |    4 +
 ....composite.canvas.source-out.worker.js.ini |    4 +
 .../2d.composite.canvas.source-over.html.ini  |    4 +
 ...composite.canvas.source-over.worker.js.ini |    4 +
 .../2d.composite.canvas.xor.html.ini          |    4 +
 .../2d.composite.canvas.xor.worker.js.ini     |    4 +
 .../2d.composite.globalAlpha.image.html.ini   |    4 +
 ....composite.globalAlpha.image.worker.js.ini |    4 +
 ...omposite.globalAlpha.imagepattern.html.ini |    4 +
 ...ite.globalAlpha.imagepattern.worker.js.ini |    4 +
 .../2d.composite.image.copy.html.ini          |    4 +
 .../2d.composite.image.copy.worker.js.ini     |    4 +
 ....composite.image.destination-atop.html.ini |    4 +
 ...osite.image.destination-atop.worker.js.ini |    4 +
 ...2d.composite.image.destination-in.html.ini |    4 +
 ...mposite.image.destination-in.worker.js.ini |    4 +
 ...d.composite.image.destination-out.html.ini |    4 +
 ...posite.image.destination-out.worker.js.ini |    4 +
 ....composite.image.destination-over.html.ini |    4 +
 ...osite.image.destination-over.worker.js.ini |    4 +
 .../2d.composite.image.lighter.html.ini       |    4 +
 .../2d.composite.image.lighter.worker.js.ini  |    4 +
 .../2d.composite.image.source-atop.html.ini   |    4 +
 ....composite.image.source-atop.worker.js.ini |    4 +
 .../2d.composite.image.source-in.html.ini     |    4 +
 ...2d.composite.image.source-in.worker.js.ini |    4 +
 .../2d.composite.image.source-out.html.ini    |    4 +
 ...d.composite.image.source-out.worker.js.ini |    4 +
 .../2d.composite.image.source-over.html.ini   |    4 +
 ....composite.image.source-over.worker.js.ini |    4 +
 .../2d.composite.image.xor.html.ini           |    4 +
 .../2d.composite.image.xor.worker.js.ini      |    4 +
 ...2d.composite.uncovered.image.copy.html.ini |    4 +
 ...mposite.uncovered.image.copy.worker.js.ini |    4 +
 ....uncovered.image.destination-atop.html.ini |    4 +
 ...vered.image.destination-atop.worker.js.ini |    4 +
 ...te.uncovered.image.destination-in.html.ini |    4 +
 ...covered.image.destination-in.worker.js.ini |    4 +
 ...mposite.uncovered.image.source-in.html.ini |    4 +
 ...te.uncovered.image.source-in.worker.js.ini |    4 +
 ...posite.uncovered.image.source-out.html.ini |    4 +
 ...e.uncovered.image.source-out.worker.js.ini |    4 +
 ....composite.uncovered.pattern.copy.html.ini |    4 +
 ...osite.uncovered.pattern.copy.worker.js.ini |    4 +
 ...ncovered.pattern.destination-atop.html.ini |    4 +
 ...red.pattern.destination-atop.worker.js.ini |    4 +
 ....uncovered.pattern.destination-in.html.ini |    4 +
 ...vered.pattern.destination-in.worker.js.ini |    4 +
 ...osite.uncovered.pattern.source-in.html.ini |    4 +
 ....uncovered.pattern.source-in.worker.js.ini |    4 +
 ...site.uncovered.pattern.source-out.html.ini |    4 +
 ...uncovered.pattern.source-out.worker.js.ini |    4 +
 .../2d.drawImage.3arg.html.ini                |    4 +
 .../2d.drawImage.3arg.worker.js.ini           |    4 +
 .../2d.drawImage.5arg.html.ini                |    4 +
 .../2d.drawImage.5arg.worker.js.ini           |    4 +
 .../2d.drawImage.9arg.basic.html.ini          |    4 +
 .../2d.drawImage.9arg.basic.worker.js.ini     |    4 +
 .../2d.drawImage.9arg.destpos.html.ini        |    4 +
 .../2d.drawImage.9arg.destpos.worker.js.ini   |    4 +
 .../2d.drawImage.9arg.destsize.html.ini       |    4 +
 .../2d.drawImage.9arg.destsize.worker.js.ini  |    4 +
 .../2d.drawImage.9arg.sourcepos.html.ini      |    4 +
 .../2d.drawImage.9arg.sourcepos.worker.js.ini |    4 +
 .../2d.drawImage.9arg.sourcesize.html.ini     |    4 +
 ...2d.drawImage.9arg.sourcesize.worker.js.ini |    4 +
 .../2d.drawImage.alpha.html.ini               |    4 +
 .../2d.drawImage.alpha.worker.js.ini          |    4 +
 .../2d.drawImage.animated.poster.html.ini     |    4 +
 ...2d.drawImage.animated.poster.worker.js.ini |    4 +
 .../2d.drawImage.broken.html.ini              |    4 +
 .../2d.drawImage.broken.worker.js.ini         |    4 +
 .../2d.drawImage.clip.html.ini                |    4 +
 .../2d.drawImage.clip.worker.js.ini           |    4 +
 .../2d.drawImage.composite.html.ini           |    4 +
 .../2d.drawImage.composite.worker.js.ini      |    4 +
 .../2d.drawImage.floatsource.html.ini         |    4 +
 .../2d.drawImage.floatsource.worker.js.ini    |    4 +
 .../2d.drawImage.negativedest.html.ini        |    4 +
 .../2d.drawImage.negativedest.worker.js.ini   |    4 +
 .../2d.drawImage.negativedir.html.ini         |    4 +
 .../2d.drawImage.negativedir.worker.js.ini    |    4 +
 .../2d.drawImage.negativesource.html.ini      |    4 +
 .../2d.drawImage.negativesource.worker.js.ini |    4 +
 .../2d.drawImage.nonfinite.html.ini           |    4 +
 .../2d.drawImage.nonfinite.worker.js.ini      |    4 +
 .../2d.drawImage.nowrap.html.ini              |    4 +
 .../2d.drawImage.nowrap.worker.js.ini         |    4 +
 .../2d.drawImage.path.html.ini                |    4 +
 .../2d.drawImage.path.worker.js.ini           |    4 +
 .../2d.drawImage.svg.html.ini                 |    4 +
 .../2d.drawImage.svg.worker.js.ini            |    4 +
 .../2d.drawImage.transform.html.ini           |    4 +
 .../2d.drawImage.transform.worker.js.ini      |    4 +
 .../2d.drawImage.zerosource.html.ini          |    4 +
 .../2d.drawImage.zerosource.image.html.ini    |    4 +
 ...d.drawImage.zerosource.image.worker.js.ini |    4 +
 .../2d.drawImage.zerosource.worker.js.ini     |    4 +
 .../2d.pattern.basic.image.html.ini           |    4 +
 .../2d.pattern.basic.image.worker.js.ini      |    4 +
 .../2d.pattern.crosscanvas.html.ini           |    4 +
 .../2d.pattern.crosscanvas.worker.js.ini      |    4 +
 .../2d.pattern.paint.norepeat.basic.html.ini  |    4 +
 ...pattern.paint.norepeat.basic.worker.js.ini |    4 +
 .../2d.pattern.paint.norepeat.coord1.html.ini |    4 +
 ...attern.paint.norepeat.coord1.worker.js.ini |    4 +
 .../2d.pattern.paint.norepeat.coord2.html.ini |    4 +
 ...attern.paint.norepeat.coord2.worker.js.ini |    4 +
 .../2d.pattern.paint.norepeat.coord3.html.ini |    4 +
 ...attern.paint.norepeat.coord3.worker.js.ini |    4 +
 ...2d.pattern.paint.norepeat.outside.html.ini |    4 +
 ...ttern.paint.norepeat.outside.worker.js.ini |    4 +
 ...d.pattern.paint.orientation.image.html.ini |    4 +
 ...tern.paint.orientation.image.worker.js.ini |    4 +
 .../2d.pattern.paint.repeat.basic.html.ini    |    4 +
 ...d.pattern.paint.repeat.basic.worker.js.ini |    4 +
 .../2d.pattern.paint.repeat.coord1.html.ini   |    4 +
 ....pattern.paint.repeat.coord1.worker.js.ini |    4 +
 .../2d.pattern.paint.repeat.coord2.html.ini   |    4 +
 ....pattern.paint.repeat.coord2.worker.js.ini |    4 +
 .../2d.pattern.paint.repeat.coord3.html.ini   |    4 +
 ....pattern.paint.repeat.coord3.worker.js.ini |    4 +
 .../2d.pattern.paint.repeat.outside.html.ini  |    4 +
 ...pattern.paint.repeat.outside.worker.js.ini |    4 +
 .../2d.pattern.paint.repeatx.basic.html.ini   |    4 +
 ....pattern.paint.repeatx.basic.worker.js.ini |    4 +
 .../2d.pattern.paint.repeatx.coord1.html.ini  |    4 +
 ...pattern.paint.repeatx.coord1.worker.js.ini |    4 +
 .../2d.pattern.paint.repeatx.outside.html.ini |    4 +
 ...attern.paint.repeatx.outside.worker.js.ini |    4 +
 .../2d.pattern.paint.repeaty.basic.html.ini   |    4 +
 ....pattern.paint.repeaty.basic.worker.js.ini |    4 +
 .../2d.pattern.paint.repeaty.coord1.html.ini  |    4 +
 ...pattern.paint.repeaty.coord1.worker.js.ini |    4 +
 .../2d.pattern.paint.repeaty.outside.html.ini |    4 +
 ...attern.paint.repeaty.outside.worker.js.ini |    4 +
 .../2d.pattern.repeat.empty.html.ini          |    4 +
 .../2d.pattern.repeat.empty.worker.js.ini     |    4 +
 .../shadows/2d.shadow.image.alpha.html.ini    |    4 +
 .../2d.shadow.image.alpha.worker.js.ini       |    4 +
 .../shadows/2d.shadow.image.basic.html.ini    |    4 +
 .../2d.shadow.image.basic.worker.js.ini       |    4 +
 .../shadows/2d.shadow.image.scale.html.ini    |    4 +
 .../2d.shadow.image.scale.worker.js.ini       |    4 +
 .../shadows/2d.shadow.image.section.html.ini  |    4 +
 .../2d.shadow.image.section.worker.js.ini     |    4 +
 .../2d.shadow.image.transparent.1.html.ini    |    4 +
 ...d.shadow.image.transparent.1.worker.js.ini |    4 +
 .../2d.shadow.image.transparent.2.html.ini    |    4 +
 ...d.shadow.image.transparent.2.worker.js.ini |    4 +
 .../shadows/2d.shadow.pattern.alpha.html.ini  |    4 +
 .../2d.shadow.pattern.alpha.worker.js.ini     |    4 +
 .../shadows/2d.shadow.pattern.basic.html.ini  |    4 +
 .../2d.shadow.pattern.basic.worker.js.ini     |    4 +
 .../2d.shadow.pattern.transparent.1.html.ini  |    4 +
 ...shadow.pattern.transparent.1.worker.js.ini |    4 +
 .../2d.shadow.pattern.transparent.2.html.ini  |    4 +
 ...shadow.pattern.transparent.2.worker.js.ini |    4 +
 .../text/2d.text.draw.align.center.html.ini   |    4 +
 .../2d.text.draw.align.center.worker.js.ini   |    4 +
 .../text/2d.text.draw.align.end.ltr.html.ini  |    4 +
 .../2d.text.draw.align.end.ltr.worker.js.ini  |    4 +
 .../text/2d.text.draw.align.end.rtl.html.ini  |    4 +
 .../2d.text.draw.align.end.rtl.worker.js.ini  |    4 +
 .../text/2d.text.draw.align.left.html.ini     |    4 +
 .../2d.text.draw.align.left.worker.js.ini     |    4 +
 .../text/2d.text.draw.align.right.html.ini    |    4 +
 .../2d.text.draw.align.right.worker.js.ini    |    4 +
 .../2d.text.draw.align.start.ltr.html.ini     |    4 +
 ...2d.text.draw.align.start.ltr.worker.js.ini |    4 +
 .../2d.text.draw.align.start.rtl.html.ini     |    4 +
 ...2d.text.draw.align.start.rtl.worker.js.ini |    4 +
 .../2d.text.draw.baseline.alphabetic.html.ini |    4 +
 ...ext.draw.baseline.alphabetic.worker.js.ini |    4 +
 .../2d.text.draw.baseline.bottom.html.ini     |    4 +
 ...2d.text.draw.baseline.bottom.worker.js.ini |    4 +
 .../2d.text.draw.baseline.hanging.html.ini    |    4 +
 ...d.text.draw.baseline.hanging.worker.js.ini |    4 +
 ...2d.text.draw.baseline.ideographic.html.ini |    4 +
 ...xt.draw.baseline.ideographic.worker.js.ini |    4 +
 .../2d.text.draw.baseline.middle.html.ini     |    4 +
 ...2d.text.draw.baseline.middle.worker.js.ini |    4 +
 .../text/2d.text.draw.baseline.top.html.ini   |    4 +
 .../2d.text.draw.baseline.top.worker.js.ini   |    4 +
 .../2d.text.draw.fill.maxWidth.bound.html.ini |    4 +
 ...ext.draw.fill.maxWidth.bound.worker.js.ini |    4 +
 ....text.draw.fill.maxWidth.fontface.html.ini |    4 +
 ....draw.fill.maxWidth.fontface.worker.js.ini |    4 +
 .../text/2d.text.draw.fontface.html.ini       |    4 +
 .../2d.text.draw.fontface.notinpage.html.ini  |    4 +
 ...text.draw.fontface.notinpage.worker.js.ini |    4 +
 .../2d.text.draw.fontface.repeat.html.ini     |    4 +
 ...2d.text.draw.fontface.repeat.worker.js.ini |    4 +
 .../text/2d.text.draw.fontface.worker.js.ini  |    4 +
 .../text/2d.text.draw.space.basic.html.ini    |    4 +
 .../2d.text.draw.space.basic.worker.js.ini    |    4 +
 .../2d.text.draw.space.collapse.end.html.ini  |    4 +
 ...text.draw.space.collapse.end.worker.js.ini |    4 +
 ...text.draw.space.collapse.nonspace.html.ini |    4 +
 ...draw.space.collapse.nonspace.worker.js.ini |    4 +
 ...2d.text.draw.space.collapse.other.html.ini |    4 +
 ...xt.draw.space.collapse.other.worker.js.ini |    4 +
 ...2d.text.draw.space.collapse.space.html.ini |    4 +
 ...xt.draw.space.collapse.space.worker.js.ini |    4 +
 ...2d.text.draw.space.collapse.start.html.ini |    4 +
 ...xt.draw.space.collapse.start.worker.js.ini |    4 +
 .../the-offscreen-canvas/size.large.html.ini  |    2 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../webxr/xrFrame_getPose.https.html.ini      |    6 +-
 .../alpha/import-in-moduleworker.html.ini     |    1 +
 .../periodicsync.https.window.js              |   14 +
 tests/wpt/web-platform-tests/README.md        |    2 +
 .../reporting/report-only-unsafe-eval.html    |    3 +-
 .../fixed-size-child-with-overflow.html       |   10 +
 .../nested-with-too-tall-line-ref.html        |    6 +
 .../nested-with-too-tall-line.html            |   14 +
 .../css/css-pseudo/marker-default-styles.html |   42 +
 ...rker-font-variant-numeric-default-ref.html |   88 +
 .../marker-font-variant-numeric-default.html  |  109 +
 ...arker-font-variant-numeric-normal-ref.html |   81 +
 .../marker-font-variant-numeric-normal.html   |  116 +
 .../marker-unicode-bidi-default-ref.html      |   64 +
 .../marker-unicode-bidi-default.html          |   85 +
 .../marker-unicode-bidi-normal-ref.html       |   64 +
 .../marker-unicode-bidi-normal.html           |   86 +
 .../infinite-scroll-event.tentative.html      |    3 +-
 .../text-transform-capitalize-001-ref.html    |    2 +-
 .../text-transform-capitalize-003-ref.html    |    2 +-
 .../text-transform-capitalize-005-ref.html    |    2 +-
 .../text-transform-capitalize-007-ref.html    |    2 +-
 .../text-transform-capitalize-009-ref.html    |    2 +-
 .../text-transform-capitalize-010-ref.html    |    2 +-
 .../text-transform-capitalize-011-ref.html    |    2 +-
 .../text-transform-capitalize-014-ref.html    |    2 +-
 .../text-transform-capitalize-016-ref.html    |    2 +-
 .../text-transform-capitalize-018-ref.html    |    2 +-
 .../text-transform-capitalize-020-ref.html    |    2 +-
 .../text-transform-capitalize-022-ref.html    |    2 +-
 .../text-transform-capitalize-024-ref.html    |    2 +-
 .../text-transform-capitalize-026-ref.html    |    2 +-
 .../text-transform-capitalize-028-ref.html    |    2 +-
 .../text-transform-capitalize-030-ref.html    |    2 +-
 .../text-transform-upperlower-001-ref.html    |    2 +-
 .../text-transform-upperlower-002-ref.html    |    2 +-
 .../text-transform-upperlower-003-ref.html    |    2 +-
 .../text-transform-upperlower-004-ref.html    |    2 +-
 .../text-transform-upperlower-005-ref.html    |    2 +-
 .../text-transform-upperlower-006-ref.html    |    2 +-
 .../text-transform-upperlower-007-ref.html    |    2 +-
 .../text-transform-upperlower-008-ref.html    |    2 +-
 .../text-transform-upperlower-009-ref.html    |    2 +-
 .../text-transform-upperlower-010-ref.html    |    2 +-
 .../text-transform-upperlower-011-ref.html    |    2 +-
 .../text-transform-upperlower-012-ref.html    |    2 +-
 .../text-transform-upperlower-014-ref.html    |    2 +-
 .../text-transform-upperlower-015-ref.html    |    2 +-
 .../text-transform-upperlower-016-ref.html    |    2 +-
 .../text-transform-upperlower-017-ref.html    |    2 +-
 .../text-transform-upperlower-018-ref.html    |    2 +-
 .../text-transform-upperlower-019-ref.html    |    2 +-
 .../text-transform-upperlower-020-ref.html    |    2 +-
 .../text-transform-upperlower-021-ref.html    |    2 +-
 .../text-transform-upperlower-022-ref.html    |    2 +-
 .../text-transform-upperlower-023-ref.html    |    2 +-
 .../text-transform-upperlower-024-ref.html    |    2 +-
 .../text-transform-upperlower-025-ref.html    |    2 +-
 .../text-transform-upperlower-026-ref.html    |    2 +-
 .../text-transform-upperlower-027-ref.html    |    2 +-
 .../text-transform-upperlower-028-ref.html    |    2 +-
 .../text-transform-upperlower-029-ref.html    |    2 +-
 .../text-transform-upperlower-030-ref.html    |    2 +-
 .../text-transform-upperlower-031-ref.html    |    2 +-
 .../text-transform-upperlower-032-ref.html    |    4 +-
 .../text-transform-upperlower-033-ref.html    |    4 +-
 .../text-transform-upperlower-034-ref.html    |    4 +-
 .../text-transform-upperlower-035-ref.html    |    4 +-
 .../text-transform-upperlower-039-ref.html    |    2 +-
 .../text-transform-upperlower-040-ref.html    |    2 +-
 .../text-transform-upperlower-041-ref.html    |    2 +-
 .../text-transform-upperlower-042-ref.html    |    2 +-
 .../text-transform-upperlower-043-ref.html    |    2 +-
 .../text-transform-upperlower-044-ref.html    |    2 +-
 .../text-transform-upperlower-101-ref.html    |    2 +-
 .../text-transform-upperlower-102-ref.html    |    2 +-
 .../text-transform-upperlower-103-ref.html    |    2 +-
 .../text-transform-upperlower-104-ref.html    |    2 +-
 .../text-transform-capitalize-001.html        |    2 +-
 .../text-transform-capitalize-003.html        |    2 +-
 .../text-transform-capitalize-005.html        |    2 +-
 .../text-transform-capitalize-007.html        |    2 +-
 .../text-transform-capitalize-009.html        |    2 +-
 .../text-transform-capitalize-010.html        |    2 +-
 .../text-transform-capitalize-011.html        |    2 +-
 .../text-transform-capitalize-014.html        |    2 +-
 .../text-transform-capitalize-016.html        |    2 +-
 .../text-transform-capitalize-018.html        |    2 +-
 .../text-transform-capitalize-020.html        |    2 +-
 .../text-transform-capitalize-022.html        |    2 +-
 .../text-transform-capitalize-024.html        |    2 +-
 .../text-transform-capitalize-026.html        |    2 +-
 .../text-transform-capitalize-028.html        |    2 +-
 .../text-transform-capitalize-030.html        |    2 +-
 .../text-transform-upperlower-001.html        |    2 +-
 .../text-transform-upperlower-002.html        |    2 +-
 .../text-transform-upperlower-003.html        |    2 +-
 .../text-transform-upperlower-004.html        |    2 +-
 .../text-transform-upperlower-005.html        |    2 +-
 .../text-transform-upperlower-006.html        |    2 +-
 .../text-transform-upperlower-007.html        |    2 +-
 .../text-transform-upperlower-008.html        |    2 +-
 .../text-transform-upperlower-009.html        |    2 +-
 .../text-transform-upperlower-010.html        |    2 +-
 .../text-transform-upperlower-011.html        |    2 +-
 .../text-transform-upperlower-012.html        |    2 +-
 .../text-transform-upperlower-014.html        |    2 +-
 .../text-transform-upperlower-015.html        |    2 +-
 .../text-transform-upperlower-016.html        |    2 +-
 .../text-transform-upperlower-017.html        |    2 +-
 .../text-transform-upperlower-018.html        |    2 +-
 .../text-transform-upperlower-019.html        |    2 +-
 .../text-transform-upperlower-020.html        |    2 +-
 .../text-transform-upperlower-021.html        |    2 +-
 .../text-transform-upperlower-022.html        |    2 +-
 .../text-transform-upperlower-023.html        |    2 +-
 .../text-transform-upperlower-024.html        |    2 +-
 .../text-transform-upperlower-025.html        |    2 +-
 .../text-transform-upperlower-026.html        |    2 +-
 .../text-transform-upperlower-027.html        |    2 +-
 .../text-transform-upperlower-028.html        |    2 +-
 .../text-transform-upperlower-029.html        |    2 +-
 .../text-transform-upperlower-030.html        |    2 +-
 .../text-transform-upperlower-031.html        |    2 +-
 .../text-transform-upperlower-032.html        |    4 +-
 .../text-transform-upperlower-033.html        |    4 +-
 .../text-transform-upperlower-034.html        |    4 +-
 .../text-transform-upperlower-035.html        |    4 +-
 .../text-transform-upperlower-039.html        |    2 +-
 .../text-transform-upperlower-040.html        |    2 +-
 .../text-transform-upperlower-041.html        |    2 +-
 .../text-transform-upperlower-042.html        |    2 +-
 .../text-transform-upperlower-043.html        |    2 +-
 .../text-transform-upperlower-044.html        |    2 +-
 .../text-transform-upperlower-101.html        |    2 +-
 .../text-transform-upperlower-102.html        |    2 +-
 .../text-transform-upperlower-103.html        |    2 +-
 .../text-transform-upperlower-104.html        |    2 +-
 ...word-break-break-all-inline-006-a-ref.html |   20 +
 ...word-break-break-all-inline-006-b-ref.html |   20 +
 .../word-break-break-all-inline-006-ref.html  |    9 -
 .../word-break-break-all-inline-006.html      |   26 +-
 .../css/cssom/cssimportrule-parent.html       |   20 +
 .../cssom/cssimportrule-sheet-identity.html   |   24 +
 .../css/cssom/support/import-rule.css         |    1 +
 ...t_access_feature_policy.tentative.sub.html |   28 -
 ...cument_access_parent_access.tentative.html |    2 +-
 .../update-the-rendering.html                 |    5 +-
 .../import-maps/common/README.md              |   79 +
 .../common/resolving.tentative.html           |   23 +
 .../common/resources/common-test-helper.js    |  163 +
 .../common/resources/data-base-url.json       |   17 +
 .../common/resources/empty-import-map.json    |   56 +
 .../common/resources/overlapping-entries.json |   25 +
 .../packages-via-trailing-slashes.json        |   43 +
 .../resources/scopes-exact-vs-prefix.json     |  134 +
 .../import-maps/common/resources/scopes.json  |  171 +
 .../common/resources/tricky-specifiers.json   |   43 +
 .../common/resources/url-specifiers.json      |   52 +
 .../import-maps/common/tools/format_json.py   |   27 +
 .../imported/resolving-scopes.tentative.html  |   11 -
 .../imported/resolving.tentative.html         |   11 -
 .../imported/resources/resolving-scopes.js    |  222 -
 .../imported/resources/resolving.js           |  232 -
 .../testdriver/set_permission.html.ini        |    3 +
 .../testdriver/set_permission.html            |   17 +
 tests/wpt/web-platform-tests/lint.whitelist   |    1 +
 .../longtask-timing/containerTypes.html       |   64 +
 .../longtask-timing/longtask-attributes.html  |    1 +
 .../longtask-in-childiframe-crossorigin.html  |    1 +
 .../longtask-in-childiframe.html              |    1 +
 .../longtask-in-externalscript.html           |    1 +
 .../longtask-in-parentiframe.html             |    1 +
 .../longtask-timing/longtask-in-raf.html      |    1 +
 ...ongtask-in-sibling-iframe-crossorigin.html |    1 +
 .../longtask-in-sibling-iframe.html           |    1 +
 .../subframe-observing-longtask.html          |    1 +
 .../media-capabilities/decodingInfo.any.js    |   18 +
 .../compositing/2d.composite.canvas.copy.html |    8 +-
 .../2d.composite.canvas.copy.worker.js        |    8 +-
 .../2d.composite.canvas.destination-atop.html |    8 +-
 ...omposite.canvas.destination-atop.worker.js |    8 +-
 .../2d.composite.canvas.destination-in.html   |    8 +-
 ....composite.canvas.destination-in.worker.js |    8 +-
 .../2d.composite.canvas.destination-out.html  |    8 +-
 ...composite.canvas.destination-out.worker.js |    8 +-
 .../2d.composite.canvas.destination-over.html |    8 +-
 ...omposite.canvas.destination-over.worker.js |    8 +-
 .../2d.composite.canvas.lighter.html          |    8 +-
 .../2d.composite.canvas.lighter.worker.js     |    8 +-
 .../2d.composite.canvas.source-atop.html      |    8 +-
 .../2d.composite.canvas.source-atop.worker.js |    8 +-
 .../2d.composite.canvas.source-in.html        |    8 +-
 .../2d.composite.canvas.source-in.worker.js   |    8 +-
 .../2d.composite.canvas.source-out.html       |    8 +-
 .../2d.composite.canvas.source-out.worker.js  |    8 +-
 .../2d.composite.canvas.source-over.html      |    8 +-
 .../2d.composite.canvas.source-over.worker.js |    8 +-
 .../compositing/2d.composite.canvas.xor.html  |    8 +-
 .../2d.composite.canvas.xor.worker.js         |    8 +-
 .../compositing/2d.composite.clip.copy.html   |    5 +-
 .../2d.composite.clip.copy.worker.js          |    5 +-
 .../2d.composite.clip.destination-atop.html   |    5 +-
 ....composite.clip.destination-atop.worker.js |    5 +-
 .../2d.composite.clip.destination-in.html     |    5 +-
 ...2d.composite.clip.destination-in.worker.js |    5 +-
 .../2d.composite.clip.destination-out.html    |    5 +-
 ...d.composite.clip.destination-out.worker.js |    5 +-
 .../2d.composite.clip.destination-over.html   |    5 +-
 ....composite.clip.destination-over.worker.js |    5 +-
 .../2d.composite.clip.lighter.html            |    5 +-
 .../2d.composite.clip.lighter.worker.js       |    5 +-
 .../2d.composite.clip.source-atop.html        |    5 +-
 .../2d.composite.clip.source-atop.worker.js   |    5 +-
 .../2d.composite.clip.source-in.html          |    5 +-
 .../2d.composite.clip.source-in.worker.js     |    5 +-
 .../2d.composite.clip.source-out.html         |    5 +-
 .../2d.composite.clip.source-out.worker.js    |    5 +-
 .../2d.composite.clip.source-over.html        |    5 +-
 .../2d.composite.clip.source-over.worker.js   |    5 +-
 .../compositing/2d.composite.clip.xor.html    |    5 +-
 .../2d.composite.clip.xor.worker.js           |    5 +-
 .../2d.composite.globalAlpha.canvas.html      |    5 +-
 .../2d.composite.globalAlpha.canvas.worker.js |    5 +-
 .../2d.composite.globalAlpha.canvascopy.html  |    5 +-
 ...composite.globalAlpha.canvascopy.worker.js |    5 +-
 ...d.composite.globalAlpha.canvaspattern.html |    5 +-
 ...posite.globalAlpha.canvaspattern.worker.js |    5 +-
 .../2d.composite.globalAlpha.default.html     |    5 +-
 ...2d.composite.globalAlpha.default.worker.js |    5 +-
 .../2d.composite.globalAlpha.fill.html        |    5 +-
 .../2d.composite.globalAlpha.fill.worker.js   |    5 +-
 .../2d.composite.globalAlpha.image.html       |    8 +-
 .../2d.composite.globalAlpha.image.worker.js  |    8 +-
 ...2d.composite.globalAlpha.imagepattern.html |    8 +-
 ...mposite.globalAlpha.imagepattern.worker.js |    8 +-
 .../2d.composite.globalAlpha.invalid.html     |    5 +-
 ...2d.composite.globalAlpha.invalid.worker.js |    5 +-
 .../2d.composite.globalAlpha.range.html       |    5 +-
 .../2d.composite.globalAlpha.range.worker.js  |    5 +-
 .../compositing/2d.composite.image.copy.html  |    8 +-
 .../2d.composite.image.copy.worker.js         |    8 +-
 .../2d.composite.image.destination-atop.html  |    8 +-
 ...composite.image.destination-atop.worker.js |    8 +-
 .../2d.composite.image.destination-in.html    |    8 +-
 ...d.composite.image.destination-in.worker.js |    8 +-
 .../2d.composite.image.destination-out.html   |    8 +-
 ....composite.image.destination-out.worker.js |    8 +-
 .../2d.composite.image.destination-over.html  |    8 +-
 ...composite.image.destination-over.worker.js |    8 +-
 .../2d.composite.image.lighter.html           |    8 +-
 .../2d.composite.image.lighter.worker.js      |    8 +-
 .../2d.composite.image.source-atop.html       |    8 +-
 .../2d.composite.image.source-atop.worker.js  |    8 +-
 .../2d.composite.image.source-in.html         |    8 +-
 .../2d.composite.image.source-in.worker.js    |    8 +-
 .../2d.composite.image.source-out.html        |    8 +-
 .../2d.composite.image.source-out.worker.js   |    8 +-
 .../2d.composite.image.source-over.html       |    8 +-
 .../2d.composite.image.source-over.worker.js  |    8 +-
 .../compositing/2d.composite.image.xor.html   |    8 +-
 .../2d.composite.image.xor.worker.js          |    8 +-
 .../2d.composite.operation.casesensitive.html |    5 +-
 ...omposite.operation.casesensitive.worker.js |    5 +-
 .../2d.composite.operation.clear.html         |    5 +-
 .../2d.composite.operation.clear.worker.js    |    5 +-
 .../2d.composite.operation.darker.html        |    5 +-
 .../2d.composite.operation.darker.worker.js   |    5 +-
 .../2d.composite.operation.default.html       |    5 +-
 .../2d.composite.operation.default.worker.js  |    5 +-
 .../2d.composite.operation.get.html           |    5 +-
 .../2d.composite.operation.get.worker.js      |    5 +-
 .../2d.composite.operation.highlight.html     |    5 +-
 ...2d.composite.operation.highlight.worker.js |    5 +-
 .../2d.composite.operation.nullsuffix.html    |    5 +-
 ...d.composite.operation.nullsuffix.worker.js |    5 +-
 .../2d.composite.operation.over.html          |    5 +-
 .../2d.composite.operation.over.worker.js     |    5 +-
 .../2d.composite.operation.unrecognised.html  |    5 +-
 ...composite.operation.unrecognised.worker.js |    5 +-
 .../compositing/2d.composite.solid.copy.html  |    5 +-
 .../2d.composite.solid.copy.worker.js         |    5 +-
 .../2d.composite.solid.destination-atop.html  |    5 +-
 ...composite.solid.destination-atop.worker.js |    5 +-
 .../2d.composite.solid.destination-in.html    |    5 +-
 ...d.composite.solid.destination-in.worker.js |    5 +-
 .../2d.composite.solid.destination-out.html   |    5 +-
 ....composite.solid.destination-out.worker.js |    5 +-
 .../2d.composite.solid.destination-over.html  |    5 +-
 ...composite.solid.destination-over.worker.js |    5 +-
 .../2d.composite.solid.lighter.html           |    5 +-
 .../2d.composite.solid.lighter.worker.js      |    5 +-
 .../2d.composite.solid.source-atop.html       |    5 +-
 .../2d.composite.solid.source-atop.worker.js  |    5 +-
 .../2d.composite.solid.source-in.html         |    5 +-
 .../2d.composite.solid.source-in.worker.js    |    5 +-
 .../2d.composite.solid.source-out.html        |    5 +-
 .../2d.composite.solid.source-out.worker.js   |    5 +-
 .../2d.composite.solid.source-over.html       |    5 +-
 .../2d.composite.solid.source-over.worker.js  |    5 +-
 .../compositing/2d.composite.solid.xor.html   |    5 +-
 .../2d.composite.solid.xor.worker.js          |    5 +-
 .../2d.composite.transparent.copy.html        |    5 +-
 .../2d.composite.transparent.copy.worker.js   |    5 +-
 ...omposite.transparent.destination-atop.html |    5 +-
 ...ite.transparent.destination-atop.worker.js |    5 +-
 ....composite.transparent.destination-in.html |    5 +-
 ...osite.transparent.destination-in.worker.js |    5 +-
 ...composite.transparent.destination-out.html |    5 +-
 ...site.transparent.destination-out.worker.js |    5 +-
 ...omposite.transparent.destination-over.html |    5 +-
 ...ite.transparent.destination-over.worker.js |    5 +-
 .../2d.composite.transparent.lighter.html     |    5 +-
 ...2d.composite.transparent.lighter.worker.js |    5 +-
 .../2d.composite.transparent.source-atop.html |    5 +-
 ...omposite.transparent.source-atop.worker.js |    5 +-
 .../2d.composite.transparent.source-in.html   |    5 +-
 ....composite.transparent.source-in.worker.js |    5 +-
 .../2d.composite.transparent.source-out.html  |    5 +-
 ...composite.transparent.source-out.worker.js |    5 +-
 .../2d.composite.transparent.source-over.html |    5 +-
 ...omposite.transparent.source-over.worker.js |    5 +-
 .../2d.composite.transparent.xor.html         |    5 +-
 .../2d.composite.transparent.xor.worker.js    |    5 +-
 .../2d.composite.uncovered.fill.copy.html     |    5 +-
 ...2d.composite.uncovered.fill.copy.worker.js |    5 +-
 ...osite.uncovered.fill.destination-atop.html |    5 +-
 ....uncovered.fill.destination-atop.worker.js |    5 +-
 ...mposite.uncovered.fill.destination-in.html |    5 +-
 ...te.uncovered.fill.destination-in.worker.js |    5 +-
 ...2d.composite.uncovered.fill.source-in.html |    5 +-
 ...mposite.uncovered.fill.source-in.worker.js |    5 +-
 ...d.composite.uncovered.fill.source-out.html |    5 +-
 ...posite.uncovered.fill.source-out.worker.js |    5 +-
 .../2d.composite.uncovered.image.copy.html    |    8 +-
 ...d.composite.uncovered.image.copy.worker.js |    8 +-
 ...site.uncovered.image.destination-atop.html |    8 +-
 ...uncovered.image.destination-atop.worker.js |    8 +-
 ...posite.uncovered.image.destination-in.html |    8 +-
 ...e.uncovered.image.destination-in.worker.js |    8 +-
 ...d.composite.uncovered.image.source-in.html |    8 +-
 ...posite.uncovered.image.source-in.worker.js |    8 +-
 ....composite.uncovered.image.source-out.html |    8 +-
 ...osite.uncovered.image.source-out.worker.js |    8 +-
 ...2d.composite.uncovered.nocontext.copy.html |    5 +-
 ...mposite.uncovered.nocontext.copy.worker.js |    5 +-
 ....uncovered.nocontext.destination-atop.html |    5 +-
 ...vered.nocontext.destination-atop.worker.js |    5 +-
 ...te.uncovered.nocontext.destination-in.html |    5 +-
 ...covered.nocontext.destination-in.worker.js |    5 +-
 ...mposite.uncovered.nocontext.source-in.html |    5 +-
 ...te.uncovered.nocontext.source-in.worker.js |    5 +-
 ...posite.uncovered.nocontext.source-out.html |    5 +-
 ...e.uncovered.nocontext.source-out.worker.js |    5 +-
 .../2d.composite.uncovered.pattern.copy.html  |    8 +-
 ...composite.uncovered.pattern.copy.worker.js |    8 +-
 ...te.uncovered.pattern.destination-atop.html |    8 +-
 ...covered.pattern.destination-atop.worker.js |    8 +-
 ...site.uncovered.pattern.destination-in.html |    8 +-
 ...uncovered.pattern.destination-in.worker.js |    8 +-
 ...composite.uncovered.pattern.source-in.html |    8 +-
 ...site.uncovered.pattern.source-in.worker.js |    8 +-
 ...omposite.uncovered.pattern.source-out.html |    8 +-
 ...ite.uncovered.pattern.source-out.worker.js |    8 +-
 .../2d.coordinatespace.html                   |    5 +-
 .../2d.coordinatespace.worker.js              |    5 +-
 .../2d.missingargs.html                       |    5 +-
 .../2d.missingargs.worker.js                  |    5 +-
 .../2d.voidreturn.html                        |    5 +-
 .../2d.voidreturn.worker.js                   |    5 +-
 .../2d.drawImage.3arg.html                    |    8 +-
 .../2d.drawImage.3arg.worker.js               |    8 +-
 .../2d.drawImage.5arg.html                    |    8 +-
 .../2d.drawImage.5arg.worker.js               |    8 +-
 .../2d.drawImage.9arg.basic.html              |    8 +-
 .../2d.drawImage.9arg.basic.worker.js         |    8 +-
 .../2d.drawImage.9arg.destpos.html            |    8 +-
 .../2d.drawImage.9arg.destpos.worker.js       |    8 +-
 .../2d.drawImage.9arg.destsize.html           |    8 +-
 .../2d.drawImage.9arg.destsize.worker.js      |    8 +-
 .../2d.drawImage.9arg.sourcepos.html          |    8 +-
 .../2d.drawImage.9arg.sourcepos.worker.js     |    8 +-
 .../2d.drawImage.9arg.sourcesize.html         |    8 +-
 .../2d.drawImage.9arg.sourcesize.worker.js    |    8 +-
 .../2d.drawImage.alpha.html                   |    8 +-
 .../2d.drawImage.alpha.worker.js              |    8 +-
 .../2d.drawImage.animated.poster.html         |    8 +-
 .../2d.drawImage.animated.poster.worker.js    |    8 +-
 .../2d.drawImage.broken.html                  |    8 +-
 .../2d.drawImage.broken.worker.js             |    8 +-
 .../2d.drawImage.canvas.html                  |    5 +-
 .../2d.drawImage.canvas.worker.js             |    5 +-
 .../2d.drawImage.clip.html                    |    8 +-
 .../2d.drawImage.clip.worker.js               |    8 +-
 .../2d.drawImage.composite.html               |    8 +-
 .../2d.drawImage.composite.worker.js          |    8 +-
 .../2d.drawImage.floatsource.html             |    8 +-
 .../2d.drawImage.floatsource.worker.js        |    8 +-
 .../2d.drawImage.negativedest.html            |    8 +-
 .../2d.drawImage.negativedest.worker.js       |    8 +-
 .../2d.drawImage.negativedir.html             |    8 +-
 .../2d.drawImage.negativedir.worker.js        |    8 +-
 .../2d.drawImage.negativesource.html          |    8 +-
 .../2d.drawImage.negativesource.worker.js     |    8 +-
 .../2d.drawImage.nonfinite.html               |    8 +-
 .../2d.drawImage.nonfinite.worker.js          |    8 +-
 .../2d.drawImage.nowrap.html                  |    8 +-
 .../2d.drawImage.nowrap.worker.js             |    8 +-
 .../2d.drawImage.null.html                    |    5 +-
 .../2d.drawImage.null.worker.js               |    5 +-
 .../2d.drawImage.path.html                    |    8 +-
 .../2d.drawImage.path.worker.js               |    8 +-
 .../2d.drawImage.self.1.html                  |    5 +-
 .../2d.drawImage.self.1.worker.js             |    5 +-
 .../2d.drawImage.self.2.html                  |    5 +-
 .../2d.drawImage.self.2.worker.js             |    5 +-
 .../2d.drawImage.svg.html                     |    8 +-
 .../2d.drawImage.svg.worker.js                |    8 +-
 .../2d.drawImage.transform.html               |    8 +-
 .../2d.drawImage.transform.worker.js          |    8 +-
 .../2d.drawImage.wrongtype.html               |    5 +-
 .../2d.drawImage.wrongtype.worker.js          |    5 +-
 .../2d.drawImage.zerocanvas.html              |    5 +-
 .../2d.drawImage.zerocanvas.worker.js         |    5 +-
 .../2d.drawImage.zerosource.html              |    8 +-
 .../2d.drawImage.zerosource.image.html        |    8 +-
 .../2d.drawImage.zerosource.image.worker.js   |    8 +-
 .../2d.drawImage.zerosource.worker.js         |    8 +-
 .../2d.clearRect.basic.html                   |    5 +-
 .../2d.clearRect.basic.worker.js              |    5 +-
 .../2d.clearRect.clip.html                    |    5 +-
 .../2d.clearRect.clip.worker.js               |    5 +-
 .../2d.clearRect.globalalpha.html             |    5 +-
 .../2d.clearRect.globalalpha.worker.js        |    5 +-
 .../2d.clearRect.globalcomposite.html         |    5 +-
 .../2d.clearRect.globalcomposite.worker.js    |    5 +-
 .../2d.clearRect.negative.html                |    5 +-
 .../2d.clearRect.negative.worker.js           |    5 +-
 .../2d.clearRect.nonfinite.html               |    5 +-
 .../2d.clearRect.nonfinite.worker.js          |    5 +-
 .../2d.clearRect.path.html                    |    5 +-
 .../2d.clearRect.path.worker.js               |    5 +-
 .../2d.clearRect.shadow.html                  |    5 +-
 .../2d.clearRect.shadow.worker.js             |    5 +-
 .../2d.clearRect.transform.html               |    5 +-
 .../2d.clearRect.transform.worker.js          |    5 +-
 .../2d.clearRect.zero.html                    |    5 +-
 .../2d.clearRect.zero.worker.js               |    5 +-
 .../2d.fillRect.basic.html                    |    5 +-
 .../2d.fillRect.basic.worker.js               |    5 +-
 .../2d.fillRect.clip.html                     |    5 +-
 .../2d.fillRect.clip.worker.js                |    5 +-
 .../2d.fillRect.negative.html                 |    5 +-
 .../2d.fillRect.negative.worker.js            |    5 +-
 .../2d.fillRect.nonfinite.html                |    5 +-
 .../2d.fillRect.nonfinite.worker.js           |    5 +-
 .../2d.fillRect.path.html                     |    5 +-
 .../2d.fillRect.path.worker.js                |    5 +-
 .../2d.fillRect.shadow.html                   |    5 +-
 .../2d.fillRect.shadow.worker.js              |    5 +-
 .../2d.fillRect.transform.html                |    5 +-
 .../2d.fillRect.transform.worker.js           |    5 +-
 .../2d.fillRect.zero.html                     |    5 +-
 .../2d.fillRect.zero.worker.js                |    5 +-
 .../2d.strokeRect.basic.html                  |    5 +-
 .../2d.strokeRect.basic.worker.js             |    5 +-
 .../2d.strokeRect.clip.html                   |    5 +-
 .../2d.strokeRect.clip.worker.js              |    5 +-
 .../2d.strokeRect.globalalpha.html            |    5 +-
 .../2d.strokeRect.globalalpha.worker.js       |    5 +-
 .../2d.strokeRect.globalcomposite.html        |    5 +-
 .../2d.strokeRect.globalcomposite.worker.js   |    5 +-
 .../2d.strokeRect.negative.html               |    5 +-
 .../2d.strokeRect.negative.worker.js          |    5 +-
 .../2d.strokeRect.nonfinite.html              |    5 +-
 .../2d.strokeRect.nonfinite.worker.js         |    5 +-
 .../2d.strokeRect.path.html                   |    5 +-
 .../2d.strokeRect.path.worker.js              |    5 +-
 .../2d.strokeRect.shadow.html                 |    5 +-
 .../2d.strokeRect.shadow.worker.js            |    5 +-
 .../2d.strokeRect.transform.html              |    5 +-
 .../2d.strokeRect.transform.worker.js         |    5 +-
 .../2d.strokeRect.zero.1.html                 |    5 +-
 .../2d.strokeRect.zero.1.worker.js            |    5 +-
 .../2d.strokeRect.zero.2.html                 |    5 +-
 .../2d.strokeRect.zero.2.worker.js            |    5 +-
 .../2d.strokeRect.zero.3.html                 |    5 +-
 .../2d.strokeRect.zero.3.worker.js            |    5 +-
 .../2d.strokeRect.zero.4.html                 |    5 +-
 .../2d.strokeRect.zero.4.worker.js            |    5 +-
 .../2d.strokeRect.zero.5.html                 |    5 +-
 .../2d.strokeRect.zero.5.worker.js            |    5 +-
 .../2d.fillStyle.default.html                 |    5 +-
 .../2d.fillStyle.default.worker.js            |    5 +-
 .../2d.fillStyle.get.semitransparent.html     |    5 +-
 ...2d.fillStyle.get.semitransparent.worker.js |    5 +-
 .../2d.fillStyle.get.solid.html               |    5 +-
 .../2d.fillStyle.get.solid.worker.js          |    5 +-
 .../2d.fillStyle.get.transparent.html         |    5 +-
 .../2d.fillStyle.get.transparent.worker.js    |    5 +-
 .../2d.fillStyle.invalidstring.html           |    5 +-
 .../2d.fillStyle.invalidstring.worker.js      |    5 +-
 .../2d.fillStyle.invalidtype.html             |    5 +-
 .../2d.fillStyle.invalidtype.worker.js        |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-1.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-1.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-2.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-2.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-3.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-3.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-4.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-4.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-5.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-5.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-6.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-6.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-7.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-7.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-8.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-8.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-hsl-9.html |    5 +-
 ...illStyle.parse.css-color-4-hsl-9.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-1.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-1.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-2.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-2.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-3.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-3.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-4.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-4.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-5.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-5.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-6.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-6.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-7.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-7.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-8.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-8.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-hsla-9.html |    5 +-
 ...llStyle.parse.css-color-4-hsla-9.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-rgb-1.html |    5 +-
 ...illStyle.parse.css-color-4-rgb-1.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-rgb-2.html |    5 +-
 ...illStyle.parse.css-color-4-rgb-2.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-rgb-3.html |    5 +-
 ...illStyle.parse.css-color-4-rgb-3.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-rgb-4.html |    5 +-
 ...illStyle.parse.css-color-4-rgb-4.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-rgb-5.html |    5 +-
 ...illStyle.parse.css-color-4-rgb-5.worker.js |    5 +-
 .../2d.fillStyle.parse.css-color-4-rgb-6.html |    5 +-
 ...illStyle.parse.css-color-4-rgb-6.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-rgba-1.html |    5 +-
 ...llStyle.parse.css-color-4-rgba-1.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-rgba-2.html |    5 +-
 ...llStyle.parse.css-color-4-rgba-2.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-rgba-3.html |    5 +-
 ...llStyle.parse.css-color-4-rgba-3.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-rgba-4.html |    5 +-
 ...llStyle.parse.css-color-4-rgba-4.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-rgba-5.html |    5 +-
 ...llStyle.parse.css-color-4-rgba-5.worker.js |    5 +-
 ...2d.fillStyle.parse.css-color-4-rgba-6.html |    5 +-
 ...llStyle.parse.css-color-4-rgba-6.worker.js |    5 +-
 .../2d.fillStyle.parse.hex3.html              |    5 +-
 .../2d.fillStyle.parse.hex3.worker.js         |    5 +-
 .../2d.fillStyle.parse.hex4.html              |    5 +-
 .../2d.fillStyle.parse.hex4.worker.js         |    5 +-
 .../2d.fillStyle.parse.hex6.html              |    5 +-
 .../2d.fillStyle.parse.hex6.worker.js         |    5 +-
 .../2d.fillStyle.parse.hex8.html              |    5 +-
 .../2d.fillStyle.parse.hex8.worker.js         |    5 +-
 .../2d.fillStyle.parse.hsl-1.html             |    5 +-
 .../2d.fillStyle.parse.hsl-1.worker.js        |    5 +-
 .../2d.fillStyle.parse.hsl-2.html             |    5 +-
 .../2d.fillStyle.parse.hsl-2.worker.js        |    5 +-
 .../2d.fillStyle.parse.hsl-3.html             |    5 +-
 .../2d.fillStyle.parse.hsl-3.worker.js        |    5 +-
 .../2d.fillStyle.parse.hsl-4.html             |    5 +-
 .../2d.fillStyle.parse.hsl-4.worker.js        |    5 +-
 .../2d.fillStyle.parse.hsl-5.html             |    5 +-
 .../2d.fillStyle.parse.hsl-5.worker.js        |    5 +-
 .../2d.fillStyle.parse.hsl-6.html             |    5 +-
 .../2d.fillStyle.parse.hsl-6.worker.js        |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-1.html       |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-1.worker.js  |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-2.html       |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-2.worker.js  |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-3.html       |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-3.worker.js  |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-4.html       |    5 +-
 .../2d.fillStyle.parse.hsl-clamp-4.worker.js  |    5 +-
 .../2d.fillStyle.parse.hsla-1.html            |    5 +-
 .../2d.fillStyle.parse.hsla-1.worker.js       |    5 +-
 .../2d.fillStyle.parse.hsla-2.html            |    5 +-
 .../2d.fillStyle.parse.hsla-2.worker.js       |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-1.html      |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-1.worker.js |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-2.html      |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-2.worker.js |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-3.html      |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-3.worker.js |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-4.html      |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-4.worker.js |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-5.html      |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-5.worker.js |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-6.html      |    5 +-
 .../2d.fillStyle.parse.hsla-clamp-6.worker.js |    5 +-
 .../2d.fillStyle.parse.html4.html             |    5 +-
 .../2d.fillStyle.parse.html4.worker.js        |    5 +-
 ...Style.parse.invalid.css-color-4-hsl-1.html |    5 +-
 ....parse.invalid.css-color-4-hsl-1.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-hsl-2.html |    5 +-
 ....parse.invalid.css-color-4-hsl-2.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-hsl-3.html |    5 +-
 ....parse.invalid.css-color-4-hsl-3.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-hsl-4.html |    5 +-
 ....parse.invalid.css-color-4-hsl-4.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-hsl-5.html |    5 +-
 ....parse.invalid.css-color-4-hsl-5.worker.js |    5 +-
 ...tyle.parse.invalid.css-color-4-hsla-1.html |    5 +-
 ...parse.invalid.css-color-4-hsla-1.worker.js |    5 +-
 ...tyle.parse.invalid.css-color-4-hsla-2.html |    5 +-
 ...parse.invalid.css-color-4-hsla-2.worker.js |    5 +-
 ...tyle.parse.invalid.css-color-4-hsla-3.html |    5 +-
 ...parse.invalid.css-color-4-hsla-3.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-rgb-1.html |    5 +-
 ....parse.invalid.css-color-4-rgb-1.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-rgb-2.html |    5 +-
 ....parse.invalid.css-color-4-rgb-2.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-rgb-3.html |    5 +-
 ....parse.invalid.css-color-4-rgb-3.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-rgb-4.html |    5 +-
 ....parse.invalid.css-color-4-rgb-4.worker.js |    5 +-
 ...Style.parse.invalid.css-color-4-rgb-5.html |    5 +-
 ....parse.invalid.css-color-4-rgb-5.worker.js |    5 +-
 ...tyle.parse.invalid.css-color-4-rgba-1.html |    5 +-
 ...parse.invalid.css-color-4-rgba-1.worker.js |    5 +-
 ...tyle.parse.invalid.css-color-4-rgba-2.html |    5 +-
 ...parse.invalid.css-color-4-rgba-2.worker.js |    5 +-
 ...tyle.parse.invalid.css-color-4-rgba-3.html |    5 +-
 ...parse.invalid.css-color-4-rgba-3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex1.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex1.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex2.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex2.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex3.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex4.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex4.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex5.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex5.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex6.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex6.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex7.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex7.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hex8.html      |    5 +-
 .../2d.fillStyle.parse.invalid.hex8.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsl-1.html     |    5 +-
 ...2d.fillStyle.parse.invalid.hsl-1.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsl-2.html     |    5 +-
 ...2d.fillStyle.parse.invalid.hsl-2.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsl-3.html     |    5 +-
 ...2d.fillStyle.parse.invalid.hsl-3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsl-4.html     |    5 +-
 ...2d.fillStyle.parse.invalid.hsl-4.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsl-5.html     |    5 +-
 ...2d.fillStyle.parse.invalid.hsl-5.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsl-6.html     |    5 +-
 ...2d.fillStyle.parse.invalid.hsl-6.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsla-1.html    |    5 +-
 ...d.fillStyle.parse.invalid.hsla-1.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsla-2.html    |    5 +-
 ...d.fillStyle.parse.invalid.hsla-2.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.hsla-3.html    |    5 +-
 ...d.fillStyle.parse.invalid.hsla-3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.name-1.html    |    5 +-
 ...d.fillStyle.parse.invalid.name-1.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.name-2.html    |    5 +-
 ...d.fillStyle.parse.invalid.name-2.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.name-3.html    |    5 +-
 ...d.fillStyle.parse.invalid.name-3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.name-4.html    |    5 +-
 ...d.fillStyle.parse.invalid.name-4.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.name-5.html    |    5 +-
 ...d.fillStyle.parse.invalid.name-5.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgb-1.html     |    5 +-
 ...2d.fillStyle.parse.invalid.rgb-1.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgb-2.html     |    5 +-
 ...2d.fillStyle.parse.invalid.rgb-2.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgb-3.html     |    5 +-
 ...2d.fillStyle.parse.invalid.rgb-3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgba-1.html    |    5 +-
 ...d.fillStyle.parse.invalid.rgba-1.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgba-2.html    |    5 +-
 ...d.fillStyle.parse.invalid.rgba-2.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgba-3.html    |    5 +-
 ...d.fillStyle.parse.invalid.rgba-3.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgba-4.html    |    5 +-
 ...d.fillStyle.parse.invalid.rgba-4.worker.js |    5 +-
 .../2d.fillStyle.parse.invalid.rgba-5.html    |    5 +-
 ...d.fillStyle.parse.invalid.rgba-5.worker.js |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-1.html       |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-1.worker.js  |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-2.html       |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-2.worker.js  |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-3.html       |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-3.worker.js  |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-4.html       |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-4.worker.js  |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-5.html       |    5 +-
 .../2d.fillStyle.parse.rgb-clamp-5.worker.js  |    5 +-
 .../2d.fillStyle.parse.rgb-eof.html           |    5 +-
 .../2d.fillStyle.parse.rgb-eof.worker.js      |    5 +-
 .../2d.fillStyle.parse.rgb-num.html           |    5 +-
 .../2d.fillStyle.parse.rgb-num.worker.js      |    5 +-
 .../2d.fillStyle.parse.rgb-percent.html       |    5 +-
 .../2d.fillStyle.parse.rgb-percent.worker.js  |    5 +-
 .../2d.fillStyle.parse.rgba-clamp-1.html      |    5 +-
 .../2d.fillStyle.parse.rgba-clamp-1.worker.js |    5 +-
 .../2d.fillStyle.parse.rgba-clamp-2.html      |    5 +-
 .../2d.fillStyle.parse.rgba-clamp-2.worker.js |    5 +-
 .../2d.fillStyle.parse.rgba-eof.html          |    5 +-
 .../2d.fillStyle.parse.rgba-eof.worker.js     |    5 +-
 .../2d.fillStyle.parse.rgba-num-1.html        |    5 +-
 .../2d.fillStyle.parse.rgba-num-1.worker.js   |    5 +-
 .../2d.fillStyle.parse.rgba-num-2.html        |    5 +-
 .../2d.fillStyle.parse.rgba-num-2.worker.js   |    5 +-
 .../2d.fillStyle.parse.rgba-percent.html      |    5 +-
 .../2d.fillStyle.parse.rgba-percent.worker.js |    5 +-
 .../2d.fillStyle.parse.rgba-solid-1.html      |    5 +-
 .../2d.fillStyle.parse.rgba-solid-1.worker.js |    5 +-
 .../2d.fillStyle.parse.rgba-solid-2.html      |    5 +-
 .../2d.fillStyle.parse.rgba-solid-2.worker.js |    5 +-
 .../2d.fillStyle.parse.rgba-solid-3.html      |    5 +-
 .../2d.fillStyle.parse.rgba-solid-3.worker.js |    5 +-
 .../2d.fillStyle.parse.rgba-solid-4.html      |    5 +-
 .../2d.fillStyle.parse.rgba-solid-4.worker.js |    5 +-
 .../2d.fillStyle.parse.svg-1.html             |    5 +-
 .../2d.fillStyle.parse.svg-1.worker.js        |    5 +-
 .../2d.fillStyle.parse.svg-2.html             |    5 +-
 .../2d.fillStyle.parse.svg-2.worker.js        |    5 +-
 .../2d.fillStyle.parse.system.html            |    5 +-
 .../2d.fillStyle.parse.system.worker.js       |    5 +-
 .../2d.fillStyle.parse.transparent-1.html     |    5 +-
 ...2d.fillStyle.parse.transparent-1.worker.js |    5 +-
 .../2d.fillStyle.parse.transparent-2.html     |    5 +-
 ...2d.fillStyle.parse.transparent-2.worker.js |    5 +-
 .../2d.gradient.empty.html                    |    5 +-
 .../2d.gradient.empty.worker.js               |    5 +-
 .../2d.gradient.interpolate.alpha.html        |    5 +-
 .../2d.gradient.interpolate.alpha.worker.js   |    5 +-
 .../2d.gradient.interpolate.colour.html       |    5 +-
 .../2d.gradient.interpolate.colour.worker.js  |    5 +-
 .../2d.gradient.interpolate.colouralpha.html  |    5 +-
 ...gradient.interpolate.colouralpha.worker.js |    5 +-
 .../2d.gradient.interpolate.multiple.html     |    5 +-
 ...2d.gradient.interpolate.multiple.worker.js |    5 +-
 .../2d.gradient.interpolate.outside.html      |    5 +-
 .../2d.gradient.interpolate.outside.worker.js |    5 +-
 .../2d.gradient.interpolate.overlap.html      |    5 +-
 .../2d.gradient.interpolate.overlap.worker.js |    5 +-
 .../2d.gradient.interpolate.overlap2.html     |    5 +-
 ...2d.gradient.interpolate.overlap2.worker.js |    5 +-
 .../2d.gradient.interpolate.solid.html        |    5 +-
 .../2d.gradient.interpolate.solid.worker.js   |    5 +-
 .../2d.gradient.interpolate.vertical.html     |    5 +-
 ...2d.gradient.interpolate.vertical.worker.js |    5 +-
 ...2d.gradient.interpolate.zerosize.fill.html |    5 +-
 ...adient.interpolate.zerosize.fill.worker.js |    5 +-
 ...radient.interpolate.zerosize.fillRect.html |    5 +-
 ...nt.interpolate.zerosize.fillRect.worker.js |    5 +-
 ....gradient.interpolate.zerosize.stroke.html |    5 +-
 ...ient.interpolate.zerosize.stroke.worker.js |    5 +-
 ...dient.interpolate.zerosize.strokeRect.html |    5 +-
 ....interpolate.zerosize.strokeRect.worker.js |    5 +-
 .../2d.gradient.linear.nonfinite.html         |    5 +-
 .../2d.gradient.linear.nonfinite.worker.js    |    5 +-
 .../2d.gradient.linear.transform.1.html       |    5 +-
 .../2d.gradient.linear.transform.1.worker.js  |    5 +-
 .../2d.gradient.linear.transform.2.html       |    5 +-
 .../2d.gradient.linear.transform.2.worker.js  |    5 +-
 .../2d.gradient.linear.transform.3.html       |    5 +-
 .../2d.gradient.linear.transform.3.worker.js  |    5 +-
 .../2d.gradient.object.compare.html           |    5 +-
 .../2d.gradient.object.compare.worker.js      |    5 +-
 .../2d.gradient.object.crosscanvas.html       |    5 +-
 .../2d.gradient.object.crosscanvas.worker.js  |    5 +-
 .../2d.gradient.object.invalidcolour.html     |    5 +-
 ...2d.gradient.object.invalidcolour.worker.js |    5 +-
 .../2d.gradient.object.invalidoffset.html     |    5 +-
 ...2d.gradient.object.invalidoffset.worker.js |    5 +-
 .../2d.gradient.object.update.html            |    5 +-
 .../2d.gradient.object.update.worker.js       |    5 +-
 .../2d.gradient.radial.cone.behind.html       |    5 +-
 .../2d.gradient.radial.cone.behind.worker.js  |    5 +-
 .../2d.gradient.radial.cone.beside.html       |    5 +-
 .../2d.gradient.radial.cone.beside.worker.js  |    5 +-
 .../2d.gradient.radial.cone.bottom.html       |    5 +-
 .../2d.gradient.radial.cone.bottom.worker.js  |    5 +-
 .../2d.gradient.radial.cone.cylinder.html     |    5 +-
 ...2d.gradient.radial.cone.cylinder.worker.js |    5 +-
 .../2d.gradient.radial.cone.front.html        |    5 +-
 .../2d.gradient.radial.cone.front.worker.js   |    5 +-
 .../2d.gradient.radial.cone.shape1.html       |    5 +-
 .../2d.gradient.radial.cone.shape1.worker.js  |    5 +-
 .../2d.gradient.radial.cone.shape2.html       |    5 +-
 .../2d.gradient.radial.cone.shape2.worker.js  |    5 +-
 .../2d.gradient.radial.cone.top.html          |    5 +-
 .../2d.gradient.radial.cone.top.worker.js     |    5 +-
 .../2d.gradient.radial.equal.html             |    5 +-
 .../2d.gradient.radial.equal.worker.js        |    5 +-
 .../2d.gradient.radial.inside1.html           |    5 +-
 .../2d.gradient.radial.inside1.worker.js      |    5 +-
 .../2d.gradient.radial.inside2.html           |    5 +-
 .../2d.gradient.radial.inside2.worker.js      |    5 +-
 .../2d.gradient.radial.inside3.html           |    5 +-
 .../2d.gradient.radial.inside3.worker.js      |    5 +-
 .../2d.gradient.radial.negative.html          |    5 +-
 .../2d.gradient.radial.negative.worker.js     |    5 +-
 .../2d.gradient.radial.nonfinite.html         |    5 +-
 .../2d.gradient.radial.nonfinite.worker.js    |    5 +-
 .../2d.gradient.radial.outside1.html          |    5 +-
 .../2d.gradient.radial.outside1.worker.js     |    5 +-
 .../2d.gradient.radial.outside2.html          |    5 +-
 .../2d.gradient.radial.outside2.worker.js     |    5 +-
 .../2d.gradient.radial.outside3.html          |    5 +-
 .../2d.gradient.radial.outside3.worker.js     |    5 +-
 .../2d.gradient.radial.touch1.html            |    5 +-
 .../2d.gradient.radial.touch1.worker.js       |    5 +-
 .../2d.gradient.radial.touch2.html            |    5 +-
 .../2d.gradient.radial.touch2.worker.js       |    5 +-
 .../2d.gradient.radial.touch3.html            |    5 +-
 .../2d.gradient.radial.touch3.worker.js       |    5 +-
 .../2d.gradient.radial.transform.1.html       |    5 +-
 .../2d.gradient.radial.transform.1.worker.js  |    5 +-
 .../2d.gradient.radial.transform.2.html       |    5 +-
 .../2d.gradient.radial.transform.2.worker.js  |    5 +-
 .../2d.gradient.radial.transform.3.html       |    5 +-
 .../2d.gradient.radial.transform.3.worker.js  |    5 +-
 .../2d.pattern.basic.canvas.html              |    5 +-
 .../2d.pattern.basic.canvas.worker.js         |    5 +-
 .../2d.pattern.basic.image.html               |    8 +-
 .../2d.pattern.basic.image.worker.js          |    8 +-
 .../2d.pattern.basic.nocontext.html           |    5 +-
 .../2d.pattern.basic.nocontext.worker.js      |    5 +-
 .../2d.pattern.basic.zerocanvas.html          |    5 +-
 .../2d.pattern.basic.zerocanvas.worker.js     |    5 +-
 .../2d.pattern.crosscanvas.html               |    8 +-
 .../2d.pattern.crosscanvas.worker.js          |    8 +-
 .../2d.pattern.image.null.html                |    5 +-
 .../2d.pattern.image.null.worker.js           |    5 +-
 .../2d.pattern.image.string.html              |    5 +-
 .../2d.pattern.image.string.worker.js         |    5 +-
 .../2d.pattern.image.undefined.html           |    5 +-
 .../2d.pattern.image.undefined.worker.js      |    5 +-
 .../2d.pattern.modify.canvas1.html            |    5 +-
 .../2d.pattern.modify.canvas1.worker.js       |    5 +-
 .../2d.pattern.modify.canvas2.html            |    5 +-
 .../2d.pattern.modify.canvas2.worker.js       |    5 +-
 .../2d.pattern.paint.norepeat.basic.html      |    8 +-
 .../2d.pattern.paint.norepeat.basic.worker.js |    8 +-
 .../2d.pattern.paint.norepeat.coord1.html     |    8 +-
 ...2d.pattern.paint.norepeat.coord1.worker.js |    8 +-
 .../2d.pattern.paint.norepeat.coord2.html     |    8 +-
 ...2d.pattern.paint.norepeat.coord2.worker.js |    8 +-
 .../2d.pattern.paint.norepeat.coord3.html     |    8 +-
 ...2d.pattern.paint.norepeat.coord3.worker.js |    8 +-
 .../2d.pattern.paint.norepeat.outside.html    |    8 +-
 ...d.pattern.paint.norepeat.outside.worker.js |    8 +-
 .../2d.pattern.paint.orientation.canvas.html  |    5 +-
 ...pattern.paint.orientation.canvas.worker.js |    5 +-
 .../2d.pattern.paint.orientation.image.html   |    8 +-
 ....pattern.paint.orientation.image.worker.js |    8 +-
 .../2d.pattern.paint.repeat.basic.html        |    8 +-
 .../2d.pattern.paint.repeat.basic.worker.js   |    8 +-
 .../2d.pattern.paint.repeat.coord1.html       |    8 +-
 .../2d.pattern.paint.repeat.coord1.worker.js  |    8 +-
 .../2d.pattern.paint.repeat.coord2.html       |    8 +-
 .../2d.pattern.paint.repeat.coord2.worker.js  |    8 +-
 .../2d.pattern.paint.repeat.coord3.html       |    8 +-
 .../2d.pattern.paint.repeat.coord3.worker.js  |    8 +-
 .../2d.pattern.paint.repeat.outside.html      |    8 +-
 .../2d.pattern.paint.repeat.outside.worker.js |    8 +-
 .../2d.pattern.paint.repeatx.basic.html       |    8 +-
 .../2d.pattern.paint.repeatx.basic.worker.js  |    8 +-
 .../2d.pattern.paint.repeatx.coord1.html      |    8 +-
 .../2d.pattern.paint.repeatx.coord1.worker.js |    8 +-
 .../2d.pattern.paint.repeatx.outside.html     |    8 +-
 ...2d.pattern.paint.repeatx.outside.worker.js |    8 +-
 .../2d.pattern.paint.repeaty.basic.html       |    8 +-
 .../2d.pattern.paint.repeaty.basic.worker.js  |    8 +-
 .../2d.pattern.paint.repeaty.coord1.html      |    8 +-
 .../2d.pattern.paint.repeaty.coord1.worker.js |    8 +-
 .../2d.pattern.paint.repeaty.outside.html     |    8 +-
 ...2d.pattern.paint.repeaty.outside.worker.js |    8 +-
 .../2d.pattern.repeat.case.html               |    5 +-
 .../2d.pattern.repeat.case.worker.js          |    5 +-
 .../2d.pattern.repeat.empty.html              |    8 +-
 .../2d.pattern.repeat.empty.worker.js         |    8 +-
 .../2d.pattern.repeat.null.html               |    5 +-
 .../2d.pattern.repeat.null.worker.js          |    5 +-
 .../2d.pattern.repeat.nullsuffix.html         |    5 +-
 .../2d.pattern.repeat.nullsuffix.worker.js    |    5 +-
 .../2d.pattern.repeat.undefined.html          |    5 +-
 .../2d.pattern.repeat.undefined.worker.js     |    5 +-
 .../2d.pattern.repeat.unrecognised.html       |    5 +-
 .../2d.pattern.repeat.unrecognised.worker.js  |    5 +-
 .../2d.pattern.repeat.unrecognisednull.html   |    5 +-
 ....pattern.repeat.unrecognisednull.worker.js |    5 +-
 .../2d.strokeStyle.default.html               |    5 +-
 .../2d.strokeStyle.default.worker.js          |    5 +-
 .../line-styles/2d.line.cap.butt.html         |    5 +-
 .../line-styles/2d.line.cap.butt.worker.js    |    5 +-
 .../line-styles/2d.line.cap.closed.html       |    5 +-
 .../line-styles/2d.line.cap.closed.worker.js  |    5 +-
 .../line-styles/2d.line.cap.invalid.html      |    5 +-
 .../line-styles/2d.line.cap.invalid.worker.js |    5 +-
 .../line-styles/2d.line.cap.open.html         |    5 +-
 .../line-styles/2d.line.cap.open.worker.js    |    5 +-
 .../line-styles/2d.line.cap.round.html        |    5 +-
 .../line-styles/2d.line.cap.round.worker.js   |    5 +-
 .../line-styles/2d.line.cap.square.html       |    5 +-
 .../line-styles/2d.line.cap.square.worker.js  |    5 +-
 .../line-styles/2d.line.cap.valid.html        |    5 +-
 .../line-styles/2d.line.cap.valid.worker.js   |    5 +-
 .../line-styles/2d.line.cross.html            |    5 +-
 .../line-styles/2d.line.cross.worker.js       |    5 +-
 .../line-styles/2d.line.defaults.html         |    5 +-
 .../line-styles/2d.line.defaults.worker.js    |    5 +-
 .../line-styles/2d.line.join.bevel.html       |    5 +-
 .../line-styles/2d.line.join.bevel.worker.js  |    5 +-
 .../line-styles/2d.line.join.closed.html      |    5 +-
 .../line-styles/2d.line.join.closed.worker.js |    5 +-
 .../line-styles/2d.line.join.invalid.html     |    5 +-
 .../2d.line.join.invalid.worker.js            |    5 +-
 .../line-styles/2d.line.join.miter.html       |    5 +-
 .../line-styles/2d.line.join.miter.worker.js  |    5 +-
 .../line-styles/2d.line.join.open.html        |    5 +-
 .../line-styles/2d.line.join.open.worker.js   |    5 +-
 .../line-styles/2d.line.join.parallel.html    |    5 +-
 .../2d.line.join.parallel.worker.js           |    5 +-
 .../line-styles/2d.line.join.round.html       |    5 +-
 .../line-styles/2d.line.join.round.worker.js  |    5 +-
 .../line-styles/2d.line.join.valid.html       |    5 +-
 .../line-styles/2d.line.join.valid.worker.js  |    5 +-
 .../line-styles/2d.line.miter.acute.html      |    5 +-
 .../line-styles/2d.line.miter.acute.worker.js |    5 +-
 .../line-styles/2d.line.miter.exceeded.html   |    5 +-
 .../2d.line.miter.exceeded.worker.js          |    5 +-
 .../line-styles/2d.line.miter.invalid.html    |    5 +-
 .../2d.line.miter.invalid.worker.js           |    5 +-
 .../line-styles/2d.line.miter.lineedge.html   |    5 +-
 .../2d.line.miter.lineedge.worker.js          |    5 +-
 .../line-styles/2d.line.miter.obtuse.html     |    5 +-
 .../2d.line.miter.obtuse.worker.js            |    5 +-
 .../line-styles/2d.line.miter.rightangle.html |    5 +-
 .../2d.line.miter.rightangle.worker.js        |    5 +-
 .../line-styles/2d.line.miter.valid.html      |    5 +-
 .../line-styles/2d.line.miter.valid.worker.js |    5 +-
 .../line-styles/2d.line.miter.within.html     |    5 +-
 .../2d.line.miter.within.worker.js            |    5 +-
 .../line-styles/2d.line.union.html            |    5 +-
 .../line-styles/2d.line.union.worker.js       |    5 +-
 .../line-styles/2d.line.width.basic.html      |    5 +-
 .../line-styles/2d.line.width.basic.worker.js |    5 +-
 .../line-styles/2d.line.width.invalid.html    |    5 +-
 .../2d.line.width.invalid.worker.js           |    5 +-
 .../2d.line.width.scaledefault.html           |    5 +-
 .../2d.line.width.scaledefault.worker.js      |    5 +-
 .../2d.line.width.transformed.html            |    5 +-
 .../2d.line.width.transformed.worker.js       |    5 +-
 .../line-styles/2d.line.width.valid.html      |    5 +-
 .../line-styles/2d.line.width.valid.worker.js |    5 +-
 .../path-objects/2d.path.arc.angle.1.html     |    5 +-
 .../2d.path.arc.angle.1.worker.js             |    5 +-
 .../path-objects/2d.path.arc.angle.2.html     |    5 +-
 .../2d.path.arc.angle.2.worker.js             |    5 +-
 .../path-objects/2d.path.arc.angle.3.html     |    5 +-
 .../2d.path.arc.angle.3.worker.js             |    5 +-
 .../path-objects/2d.path.arc.angle.4.html     |    5 +-
 .../2d.path.arc.angle.4.worker.js             |    5 +-
 .../path-objects/2d.path.arc.angle.5.html     |    5 +-
 .../2d.path.arc.angle.5.worker.js             |    5 +-
 .../path-objects/2d.path.arc.angle.6.html     |    5 +-
 .../2d.path.arc.angle.6.worker.js             |    5 +-
 .../path-objects/2d.path.arc.default.html     |    5 +-
 .../2d.path.arc.default.worker.js             |    5 +-
 .../path-objects/2d.path.arc.empty.html       |    5 +-
 .../path-objects/2d.path.arc.empty.worker.js  |    5 +-
 .../path-objects/2d.path.arc.end.html         |    5 +-
 .../path-objects/2d.path.arc.end.worker.js    |    5 +-
 .../path-objects/2d.path.arc.negative.html    |    5 +-
 .../2d.path.arc.negative.worker.js            |    5 +-
 .../path-objects/2d.path.arc.nonempty.html    |    5 +-
 .../2d.path.arc.nonempty.worker.js            |    5 +-
 .../path-objects/2d.path.arc.nonfinite.html   |    5 +-
 .../2d.path.arc.nonfinite.worker.js           |    5 +-
 .../path-objects/2d.path.arc.scale.1.html     |    5 +-
 .../2d.path.arc.scale.1.worker.js             |    5 +-
 .../path-objects/2d.path.arc.scale.2.html     |    5 +-
 .../2d.path.arc.scale.2.worker.js             |    5 +-
 .../2d.path.arc.selfintersect.1.html          |    5 +-
 .../2d.path.arc.selfintersect.1.worker.js     |    5 +-
 .../2d.path.arc.selfintersect.2.html          |    5 +-
 .../2d.path.arc.selfintersect.2.worker.js     |    5 +-
 .../path-objects/2d.path.arc.shape.1.html     |    5 +-
 .../2d.path.arc.shape.1.worker.js             |    5 +-
 .../path-objects/2d.path.arc.shape.2.html     |    5 +-
 .../2d.path.arc.shape.2.worker.js             |    5 +-
 .../path-objects/2d.path.arc.shape.3.html     |    5 +-
 .../2d.path.arc.shape.3.worker.js             |    5 +-
 .../path-objects/2d.path.arc.shape.4.html     |    5 +-
 .../2d.path.arc.shape.4.worker.js             |    5 +-
 .../path-objects/2d.path.arc.shape.5.html     |    5 +-
 .../2d.path.arc.shape.5.worker.js             |    5 +-
 .../path-objects/2d.path.arc.twopie.1.html    |    5 +-
 .../2d.path.arc.twopie.1.worker.js            |    5 +-
 .../path-objects/2d.path.arc.twopie.2.html    |    5 +-
 .../2d.path.arc.twopie.2.worker.js            |    5 +-
 .../path-objects/2d.path.arc.twopie.3.html    |    5 +-
 .../2d.path.arc.twopie.3.worker.js            |    5 +-
 .../path-objects/2d.path.arc.twopie.4.html    |    5 +-
 .../2d.path.arc.twopie.4.worker.js            |    5 +-
 .../path-objects/2d.path.arc.zero.1.html      |    5 +-
 .../path-objects/2d.path.arc.zero.1.worker.js |    5 +-
 .../path-objects/2d.path.arc.zero.2.html      |    5 +-
 .../path-objects/2d.path.arc.zero.2.worker.js |    5 +-
 .../path-objects/2d.path.arc.zeroradius.html  |    5 +-
 .../2d.path.arc.zeroradius.worker.js          |    5 +-
 .../2d.path.arcTo.coincide.1.html             |    5 +-
 .../2d.path.arcTo.coincide.1.worker.js        |    5 +-
 .../2d.path.arcTo.coincide.2.html             |    5 +-
 .../2d.path.arcTo.coincide.2.worker.js        |    5 +-
 .../2d.path.arcTo.collinear.1.html            |    5 +-
 .../2d.path.arcTo.collinear.1.worker.js       |    5 +-
 .../2d.path.arcTo.collinear.2.html            |    5 +-
 .../2d.path.arcTo.collinear.2.worker.js       |    5 +-
 .../2d.path.arcTo.collinear.3.html            |    5 +-
 .../2d.path.arcTo.collinear.3.worker.js       |    5 +-
 .../2d.path.arcTo.ensuresubpath.1.html        |    5 +-
 .../2d.path.arcTo.ensuresubpath.1.worker.js   |    5 +-
 .../2d.path.arcTo.ensuresubpath.2.html        |    5 +-
 .../2d.path.arcTo.ensuresubpath.2.worker.js   |    5 +-
 .../path-objects/2d.path.arcTo.negative.html  |    5 +-
 .../2d.path.arcTo.negative.worker.js          |    5 +-
 .../path-objects/2d.path.arcTo.nonfinite.html |    5 +-
 .../2d.path.arcTo.nonfinite.worker.js         |    5 +-
 .../path-objects/2d.path.arcTo.scale.html     |    5 +-
 .../2d.path.arcTo.scale.worker.js             |    5 +-
 .../2d.path.arcTo.shape.curve1.html           |    5 +-
 .../2d.path.arcTo.shape.curve1.worker.js      |    5 +-
 .../2d.path.arcTo.shape.curve2.html           |    5 +-
 .../2d.path.arcTo.shape.curve2.worker.js      |    5 +-
 .../path-objects/2d.path.arcTo.shape.end.html |    5 +-
 .../2d.path.arcTo.shape.end.worker.js         |    5 +-
 .../2d.path.arcTo.shape.start.html            |    5 +-
 .../2d.path.arcTo.shape.start.worker.js       |    5 +-
 .../2d.path.arcTo.transformation.html         |    5 +-
 .../2d.path.arcTo.transformation.worker.js    |    5 +-
 .../path-objects/2d.path.arcTo.zero.1.html    |    5 +-
 .../2d.path.arcTo.zero.1.worker.js            |    5 +-
 .../path-objects/2d.path.arcTo.zero.2.html    |    5 +-
 .../2d.path.arcTo.zero.2.worker.js            |    5 +-
 .../path-objects/2d.path.beginPath.html       |    5 +-
 .../path-objects/2d.path.beginPath.worker.js  |    5 +-
 .../2d.path.bezierCurveTo.basic.html          |    5 +-
 .../2d.path.bezierCurveTo.basic.worker.js     |    5 +-
 ...2d.path.bezierCurveTo.ensuresubpath.1.html |    5 +-
 ...th.bezierCurveTo.ensuresubpath.1.worker.js |    5 +-
 ...2d.path.bezierCurveTo.ensuresubpath.2.html |    5 +-
 ...th.bezierCurveTo.ensuresubpath.2.worker.js |    5 +-
 .../2d.path.bezierCurveTo.nonfinite.html      |    5 +-
 .../2d.path.bezierCurveTo.nonfinite.worker.js |    5 +-
 .../2d.path.bezierCurveTo.scaled.html         |    5 +-
 .../2d.path.bezierCurveTo.scaled.worker.js    |    5 +-
 .../2d.path.bezierCurveTo.shape.html          |    5 +-
 .../2d.path.bezierCurveTo.shape.worker.js     |    5 +-
 .../path-objects/2d.path.clip.basic.1.html    |    5 +-
 .../2d.path.clip.basic.1.worker.js            |    5 +-
 .../path-objects/2d.path.clip.basic.2.html    |    5 +-
 .../2d.path.clip.basic.2.worker.js            |    5 +-
 .../path-objects/2d.path.clip.empty.html      |    5 +-
 .../path-objects/2d.path.clip.empty.worker.js |    5 +-
 .../path-objects/2d.path.clip.intersect.html  |    5 +-
 .../2d.path.clip.intersect.worker.js          |    5 +-
 .../path-objects/2d.path.clip.unaffected.html |    5 +-
 .../2d.path.clip.unaffected.worker.js         |    5 +-
 .../path-objects/2d.path.clip.winding.1.html  |    5 +-
 .../2d.path.clip.winding.1.worker.js          |    5 +-
 .../path-objects/2d.path.clip.winding.2.html  |    5 +-
 .../2d.path.clip.winding.2.worker.js          |    5 +-
 .../path-objects/2d.path.closePath.empty.html |    5 +-
 .../2d.path.closePath.empty.worker.js         |    5 +-
 .../2d.path.closePath.newline.html            |    5 +-
 .../2d.path.closePath.newline.worker.js       |    5 +-
 .../2d.path.closePath.nextpoint.html          |    5 +-
 .../2d.path.closePath.nextpoint.worker.js     |    5 +-
 .../2d.path.fill.closed.basic.html            |    5 +-
 .../2d.path.fill.closed.basic.worker.js       |    5 +-
 .../2d.path.fill.closed.unaffected.html       |    5 +-
 .../2d.path.fill.closed.unaffected.worker.js  |    5 +-
 .../path-objects/2d.path.fill.overlap.html    |    5 +-
 .../2d.path.fill.overlap.worker.js            |    5 +-
 .../2d.path.fill.winding.add.html             |    5 +-
 .../2d.path.fill.winding.add.worker.js        |    5 +-
 .../2d.path.fill.winding.subtract.1.html      |    5 +-
 .../2d.path.fill.winding.subtract.1.worker.js |    5 +-
 .../2d.path.fill.winding.subtract.2.html      |    5 +-
 .../2d.path.fill.winding.subtract.2.worker.js |    5 +-
 .../2d.path.fill.winding.subtract.3.html      |    5 +-
 .../2d.path.fill.winding.subtract.3.worker.js |    5 +-
 .../path-objects/2d.path.initial.html         |    5 +-
 .../path-objects/2d.path.initial.worker.js    |    5 +-
 .../2d.path.isPointInPath.arc.html            |    5 +-
 .../2d.path.isPointInPath.arc.worker.js       |    5 +-
 .../2d.path.isPointInPath.basic.1.html        |    5 +-
 .../2d.path.isPointInPath.basic.1.worker.js   |    5 +-
 .../2d.path.isPointInPath.basic.2.html        |    5 +-
 .../2d.path.isPointInPath.basic.2.worker.js   |    5 +-
 .../2d.path.isPointInPath.bezier.html         |    5 +-
 .../2d.path.isPointInPath.bezier.worker.js    |    5 +-
 .../2d.path.isPointInPath.bigarc.html         |    5 +-
 .../2d.path.isPointInPath.bigarc.worker.js    |    5 +-
 .../2d.path.isPointInPath.edge.html           |    5 +-
 .../2d.path.isPointInPath.edge.worker.js      |    5 +-
 .../2d.path.isPointInPath.empty.html          |    5 +-
 .../2d.path.isPointInPath.empty.worker.js     |    5 +-
 .../2d.path.isPointInPath.nonfinite.html      |    5 +-
 .../2d.path.isPointInPath.nonfinite.worker.js |    5 +-
 .../2d.path.isPointInPath.outside.html        |    5 +-
 .../2d.path.isPointInPath.outside.worker.js   |    5 +-
 .../2d.path.isPointInPath.subpath.html        |    5 +-
 .../2d.path.isPointInPath.subpath.worker.js   |    5 +-
 .../2d.path.isPointInPath.transform.1.html    |    5 +-
 ...d.path.isPointInPath.transform.1.worker.js |    5 +-
 .../2d.path.isPointInPath.transform.2.html    |    5 +-
 ...d.path.isPointInPath.transform.2.worker.js |    5 +-
 .../2d.path.isPointInPath.transform.3.html    |    5 +-
 ...d.path.isPointInPath.transform.3.worker.js |    5 +-
 .../2d.path.isPointInPath.transform.4.html    |    5 +-
 ...d.path.isPointInPath.transform.4.worker.js |    5 +-
 .../2d.path.isPointInPath.unclosed.html       |    5 +-
 .../2d.path.isPointInPath.unclosed.worker.js  |    5 +-
 .../2d.path.isPointInPath.winding.html        |    5 +-
 .../2d.path.isPointInPath.winding.worker.js   |    5 +-
 .../path-objects/2d.path.lineTo.basic.html    |    5 +-
 .../2d.path.lineTo.basic.worker.js            |    5 +-
 .../2d.path.lineTo.ensuresubpath.1.html       |    5 +-
 .../2d.path.lineTo.ensuresubpath.1.worker.js  |    5 +-
 .../2d.path.lineTo.ensuresubpath.2.html       |    5 +-
 .../2d.path.lineTo.ensuresubpath.2.worker.js  |    5 +-
 .../2d.path.lineTo.nextpoint.html             |    5 +-
 .../2d.path.lineTo.nextpoint.worker.js        |    5 +-
 .../2d.path.lineTo.nonfinite.details.html     |    5 +-
 ...2d.path.lineTo.nonfinite.details.worker.js |    5 +-
 .../2d.path.lineTo.nonfinite.html             |    5 +-
 .../2d.path.lineTo.nonfinite.worker.js        |    5 +-
 .../path-objects/2d.path.moveTo.basic.html    |    5 +-
 .../2d.path.moveTo.basic.worker.js            |    5 +-
 .../path-objects/2d.path.moveTo.multiple.html |    5 +-
 .../2d.path.moveTo.multiple.worker.js         |    5 +-
 .../2d.path.moveTo.newsubpath.html            |    5 +-
 .../2d.path.moveTo.newsubpath.worker.js       |    5 +-
 .../2d.path.moveTo.nonfinite.html             |    5 +-
 .../2d.path.moveTo.nonfinite.worker.js        |    5 +-
 .../2d.path.quadraticCurveTo.basic.html       |    5 +-
 .../2d.path.quadraticCurveTo.basic.worker.js  |    5 +-
 ...path.quadraticCurveTo.ensuresubpath.1.html |    5 +-
 ...quadraticCurveTo.ensuresubpath.1.worker.js |    5 +-
 ...path.quadraticCurveTo.ensuresubpath.2.html |    5 +-
 ...quadraticCurveTo.ensuresubpath.2.worker.js |    5 +-
 .../2d.path.quadraticCurveTo.nonfinite.html   |    5 +-
 ....path.quadraticCurveTo.nonfinite.worker.js |    5 +-
 .../2d.path.quadraticCurveTo.scaled.html      |    5 +-
 .../2d.path.quadraticCurveTo.scaled.worker.js |    5 +-
 .../2d.path.quadraticCurveTo.shape.html       |    5 +-
 .../2d.path.quadraticCurveTo.shape.worker.js  |    5 +-
 .../path-objects/2d.path.rect.basic.html      |    5 +-
 .../path-objects/2d.path.rect.basic.worker.js |    5 +-
 .../path-objects/2d.path.rect.closed.html     |    5 +-
 .../2d.path.rect.closed.worker.js             |    5 +-
 .../path-objects/2d.path.rect.end.1.html      |    5 +-
 .../path-objects/2d.path.rect.end.1.worker.js |    5 +-
 .../path-objects/2d.path.rect.end.2.html      |    5 +-
 .../path-objects/2d.path.rect.end.2.worker.js |    5 +-
 .../path-objects/2d.path.rect.negative.html   |    5 +-
 .../2d.path.rect.negative.worker.js           |    5 +-
 .../path-objects/2d.path.rect.newsubpath.html |    5 +-
 .../2d.path.rect.newsubpath.worker.js         |    5 +-
 .../path-objects/2d.path.rect.nonfinite.html  |    5 +-
 .../2d.path.rect.nonfinite.worker.js          |    5 +-
 .../2d.path.rect.selfintersect.html           |    5 +-
 .../2d.path.rect.selfintersect.worker.js      |    5 +-
 .../path-objects/2d.path.rect.winding.html    |    5 +-
 .../2d.path.rect.winding.worker.js            |    5 +-
 .../path-objects/2d.path.rect.zero.1.html     |    5 +-
 .../2d.path.rect.zero.1.worker.js             |    5 +-
 .../path-objects/2d.path.rect.zero.2.html     |    5 +-
 .../2d.path.rect.zero.2.worker.js             |    5 +-
 .../path-objects/2d.path.rect.zero.3.html     |    5 +-
 .../2d.path.rect.zero.3.worker.js             |    5 +-
 .../path-objects/2d.path.rect.zero.4.html     |    5 +-
 .../2d.path.rect.zero.4.worker.js             |    5 +-
 .../path-objects/2d.path.rect.zero.5.html     |    5 +-
 .../2d.path.rect.zero.5.worker.js             |    5 +-
 .../path-objects/2d.path.rect.zero.6.html     |    5 +-
 .../2d.path.rect.zero.6.worker.js             |    5 +-
 .../path-objects/2d.path.stroke.empty.html    |    5 +-
 .../2d.path.stroke.empty.worker.js            |    5 +-
 .../path-objects/2d.path.stroke.overlap.html  |    5 +-
 .../2d.path.stroke.overlap.worker.js          |    5 +-
 .../2d.path.stroke.prune.arc.html             |    5 +-
 .../2d.path.stroke.prune.arc.worker.js        |    5 +-
 .../2d.path.stroke.prune.closed.html          |    5 +-
 .../2d.path.stroke.prune.closed.worker.js     |    5 +-
 .../2d.path.stroke.prune.corner.html          |    5 +-
 .../2d.path.stroke.prune.corner.worker.js     |    5 +-
 .../2d.path.stroke.prune.curve.html           |    5 +-
 .../2d.path.stroke.prune.curve.worker.js      |    5 +-
 .../2d.path.stroke.prune.line.html            |    5 +-
 .../2d.path.stroke.prune.line.worker.js       |    5 +-
 .../2d.path.stroke.prune.rect.html            |    5 +-
 .../2d.path.stroke.prune.rect.worker.js       |    5 +-
 .../path-objects/2d.path.stroke.scale1.html   |    5 +-
 .../2d.path.stroke.scale1.worker.js           |    5 +-
 .../path-objects/2d.path.stroke.scale2.html   |    5 +-
 .../2d.path.stroke.scale2.worker.js           |    5 +-
 .../path-objects/2d.path.stroke.skew.html     |    5 +-
 .../2d.path.stroke.skew.worker.js             |    5 +-
 .../2d.path.stroke.unaffected.html            |    5 +-
 .../2d.path.stroke.unaffected.worker.js       |    5 +-
 .../path-objects/2d.path.stroke.union.html    |    5 +-
 .../2d.path.stroke.union.worker.js            |    5 +-
 .../2d.path.transformation.basic.html         |    5 +-
 .../2d.path.transformation.basic.worker.js    |    5 +-
 .../2d.path.transformation.changing.html      |    5 +-
 .../2d.path.transformation.changing.worker.js |    5 +-
 .../2d.path.transformation.multiple.html      |    5 +-
 .../2d.path.transformation.multiple.worker.js |    5 +-
 .../2d.imageData.create1.basic.html           |    5 +-
 .../2d.imageData.create1.basic.worker.js      |    5 +-
 .../2d.imageData.create1.initial.html         |    5 +-
 .../2d.imageData.create1.initial.worker.js    |    5 +-
 .../2d.imageData.create1.zero.html            |    5 +-
 .../2d.imageData.create1.zero.worker.js       |    5 +-
 .../2d.imageData.create2.basic.html           |    5 +-
 .../2d.imageData.create2.basic.worker.js      |    5 +-
 .../2d.imageData.create2.initial.html         |    5 +-
 .../2d.imageData.create2.initial.worker.js    |    5 +-
 .../2d.imageData.create2.large.html           |    5 +-
 .../2d.imageData.create2.large.worker.js      |    5 +-
 .../2d.imageData.create2.negative.html        |    5 +-
 .../2d.imageData.create2.negative.worker.js   |    5 +-
 .../2d.imageData.create2.nonfinite.html       |    5 +-
 .../2d.imageData.create2.nonfinite.worker.js  |    5 +-
 .../2d.imageData.create2.round.html           |    5 +-
 .../2d.imageData.create2.round.worker.js      |    5 +-
 .../2d.imageData.create2.zero.html            |    5 +-
 .../2d.imageData.create2.zero.worker.js       |    5 +-
 .../2d.imageData.get.basic.html               |    5 +-
 .../2d.imageData.get.basic.worker.js          |    5 +-
 .../2d.imageData.get.clamp.html               |    5 +-
 .../2d.imageData.get.clamp.worker.js          |    5 +-
 .../2d.imageData.get.length.html              |    5 +-
 .../2d.imageData.get.length.worker.js         |    5 +-
 .../2d.imageData.get.nonfinite.html           |    5 +-
 .../2d.imageData.get.nonfinite.worker.js      |    5 +-
 .../2d.imageData.get.nonpremul.html           |    5 +-
 .../2d.imageData.get.nonpremul.worker.js      |    5 +-
 .../2d.imageData.get.order.alpha.html         |    5 +-
 .../2d.imageData.get.order.alpha.worker.js    |    5 +-
 .../2d.imageData.get.order.cols.html          |    5 +-
 .../2d.imageData.get.order.cols.worker.js     |    5 +-
 .../2d.imageData.get.order.rgb.html           |    5 +-
 .../2d.imageData.get.order.rgb.worker.js      |    5 +-
 .../2d.imageData.get.order.rows.html          |    5 +-
 .../2d.imageData.get.order.rows.worker.js     |    5 +-
 .../2d.imageData.get.range.html               |    5 +-
 .../2d.imageData.get.range.worker.js          |    5 +-
 .../2d.imageData.get.source.negative.html     |    5 +-
 ...2d.imageData.get.source.negative.worker.js |    5 +-
 .../2d.imageData.get.source.outside.html      |    5 +-
 .../2d.imageData.get.source.outside.worker.js |    5 +-
 .../2d.imageData.get.source.size.html         |    5 +-
 .../2d.imageData.get.source.size.worker.js    |    5 +-
 .../2d.imageData.get.tiny.html                |    5 +-
 .../2d.imageData.get.tiny.worker.js           |    5 +-
 .../2d.imageData.get.unaffected.html          |    5 +-
 .../2d.imageData.get.unaffected.worker.js     |    5 +-
 .../2d.imageData.get.zero.html                |    5 +-
 .../2d.imageData.get.zero.worker.js           |    5 +-
 .../2d.imageData.object.clamp.html            |    5 +-
 .../2d.imageData.object.clamp.worker.js       |    5 +-
 .../2d.imageData.object.nan.html              |    5 +-
 .../2d.imageData.object.nan.worker.js         |    5 +-
 .../2d.imageData.object.properties.html       |    5 +-
 .../2d.imageData.object.properties.worker.js  |    5 +-
 .../2d.imageData.object.readonly.html         |    5 +-
 .../2d.imageData.object.readonly.worker.js    |    5 +-
 .../2d.imageData.object.round.html            |    5 +-
 .../2d.imageData.object.round.worker.js       |    5 +-
 .../2d.imageData.object.set.html              |    5 +-
 .../2d.imageData.object.set.worker.js         |    5 +-
 .../2d.imageData.object.string.html           |    5 +-
 .../2d.imageData.object.string.worker.js      |    5 +-
 .../2d.imageData.object.undefined.html        |    5 +-
 .../2d.imageData.object.undefined.worker.js   |    5 +-
 .../2d.imageData.put.alpha.html               |    5 +-
 .../2d.imageData.put.alpha.worker.js          |    5 +-
 .../2d.imageData.put.basic.html               |    5 +-
 .../2d.imageData.put.basic.worker.js          |    5 +-
 .../2d.imageData.put.clip.html                |    5 +-
 .../2d.imageData.put.clip.worker.js           |    5 +-
 .../2d.imageData.put.created.html             |    5 +-
 .../2d.imageData.put.created.worker.js        |    5 +-
 .../2d.imageData.put.cross.html               |    5 +-
 .../2d.imageData.put.cross.worker.js          |    5 +-
 .../2d.imageData.put.dirty.negative.html      |    5 +-
 .../2d.imageData.put.dirty.negative.worker.js |    5 +-
 .../2d.imageData.put.dirty.outside.html       |    5 +-
 .../2d.imageData.put.dirty.outside.worker.js  |    5 +-
 .../2d.imageData.put.dirty.rect1.html         |    5 +-
 .../2d.imageData.put.dirty.rect1.worker.js    |    5 +-
 .../2d.imageData.put.dirty.rect2.html         |    5 +-
 .../2d.imageData.put.dirty.rect2.worker.js    |    5 +-
 .../2d.imageData.put.dirty.zero.html          |    5 +-
 .../2d.imageData.put.dirty.zero.worker.js     |    5 +-
 .../2d.imageData.put.modified.html            |    5 +-
 .../2d.imageData.put.modified.worker.js       |    5 +-
 .../2d.imageData.put.nonfinite.html           |    5 +-
 .../2d.imageData.put.nonfinite.worker.js      |    5 +-
 .../2d.imageData.put.null.html                |    5 +-
 .../2d.imageData.put.null.worker.js           |    5 +-
 .../2d.imageData.put.path.html                |    5 +-
 .../2d.imageData.put.path.worker.js           |    5 +-
 .../2d.imageData.put.unaffected.html          |    5 +-
 .../2d.imageData.put.unaffected.worker.js     |    5 +-
 .../2d.imageData.put.unchanged.html           |    5 +-
 .../2d.imageData.put.unchanged.worker.js      |    5 +-
 .../2d.imageData.put.wrongtype.html           |    5 +-
 .../2d.imageData.put.wrongtype.worker.js      |    5 +-
 .../shadows/2d.shadow.alpha.1.html            |    5 +-
 .../shadows/2d.shadow.alpha.1.worker.js       |    5 +-
 .../shadows/2d.shadow.alpha.2.html            |    5 +-
 .../shadows/2d.shadow.alpha.2.worker.js       |    5 +-
 .../shadows/2d.shadow.alpha.3.html            |    5 +-
 .../shadows/2d.shadow.alpha.3.worker.js       |    5 +-
 .../shadows/2d.shadow.alpha.4.html            |    5 +-
 .../shadows/2d.shadow.alpha.4.worker.js       |    5 +-
 .../shadows/2d.shadow.alpha.5.html            |    5 +-
 .../shadows/2d.shadow.alpha.5.worker.js       |    5 +-
 ....shadow.attributes.shadowBlur.initial.html |    5 +-
 ...ow.attributes.shadowBlur.initial.worker.js |    5 +-
 ....shadow.attributes.shadowBlur.invalid.html |    5 +-
 ...ow.attributes.shadowBlur.invalid.worker.js |    5 +-
 ...2d.shadow.attributes.shadowBlur.valid.html |    5 +-
 ...adow.attributes.shadowBlur.valid.worker.js |    5 +-
 ...shadow.attributes.shadowColor.initial.html |    5 +-
 ...w.attributes.shadowColor.initial.worker.js |    5 +-
 ...shadow.attributes.shadowColor.invalid.html |    5 +-
 ...w.attributes.shadowColor.invalid.worker.js |    5 +-
 ...d.shadow.attributes.shadowColor.valid.html |    5 +-
 ...dow.attributes.shadowColor.valid.worker.js |    5 +-
 ...hadow.attributes.shadowOffset.initial.html |    5 +-
 ....attributes.shadowOffset.initial.worker.js |    5 +-
 ...hadow.attributes.shadowOffset.invalid.html |    5 +-
 ....attributes.shadowOffset.invalid.worker.js |    5 +-
 ....shadow.attributes.shadowOffset.valid.html |    5 +-
 ...ow.attributes.shadowOffset.valid.worker.js |    5 +-
 .../shadows/2d.shadow.canvas.alpha.html       |    5 +-
 .../shadows/2d.shadow.canvas.alpha.worker.js  |    5 +-
 .../shadows/2d.shadow.canvas.basic.html       |    5 +-
 .../shadows/2d.shadow.canvas.basic.worker.js  |    5 +-
 .../2d.shadow.canvas.transparent.1.html       |    5 +-
 .../2d.shadow.canvas.transparent.1.worker.js  |    5 +-
 .../2d.shadow.canvas.transparent.2.html       |    5 +-
 .../2d.shadow.canvas.transparent.2.worker.js  |    5 +-
 .../shadows/2d.shadow.clip.1.html             |    5 +-
 .../shadows/2d.shadow.clip.1.worker.js        |    5 +-
 .../shadows/2d.shadow.clip.2.html             |    5 +-
 .../shadows/2d.shadow.clip.2.worker.js        |    5 +-
 .../shadows/2d.shadow.clip.3.html             |    5 +-
 .../shadows/2d.shadow.clip.3.worker.js        |    5 +-
 .../shadows/2d.shadow.composite.1.html        |    5 +-
 .../shadows/2d.shadow.composite.1.worker.js   |    5 +-
 .../shadows/2d.shadow.composite.2.html        |    5 +-
 .../shadows/2d.shadow.composite.2.worker.js   |    5 +-
 .../shadows/2d.shadow.composite.3.html        |    5 +-
 .../shadows/2d.shadow.composite.3.worker.js   |    5 +-
 .../shadows/2d.shadow.enable.blur.html        |    5 +-
 .../shadows/2d.shadow.enable.blur.worker.js   |    5 +-
 .../shadows/2d.shadow.enable.off.1.html       |    5 +-
 .../shadows/2d.shadow.enable.off.1.worker.js  |    5 +-
 .../shadows/2d.shadow.enable.off.2.html       |    5 +-
 .../shadows/2d.shadow.enable.off.2.worker.js  |    5 +-
 .../shadows/2d.shadow.enable.x.html           |    5 +-
 .../shadows/2d.shadow.enable.x.worker.js      |    5 +-
 .../shadows/2d.shadow.enable.y.html           |    5 +-
 .../shadows/2d.shadow.enable.y.worker.js      |    5 +-
 .../shadows/2d.shadow.gradient.alpha.html     |    5 +-
 .../2d.shadow.gradient.alpha.worker.js        |    5 +-
 .../shadows/2d.shadow.gradient.basic.html     |    5 +-
 .../2d.shadow.gradient.basic.worker.js        |    5 +-
 .../2d.shadow.gradient.transparent.1.html     |    5 +-
 ...2d.shadow.gradient.transparent.1.worker.js |    5 +-
 .../2d.shadow.gradient.transparent.2.html     |    5 +-
 ...2d.shadow.gradient.transparent.2.worker.js |    5 +-
 .../shadows/2d.shadow.image.alpha.html        |    8 +-
 .../shadows/2d.shadow.image.alpha.worker.js   |    8 +-
 .../shadows/2d.shadow.image.basic.html        |    8 +-
 .../shadows/2d.shadow.image.basic.worker.js   |    8 +-
 .../shadows/2d.shadow.image.scale.html        |    8 +-
 .../shadows/2d.shadow.image.scale.worker.js   |    8 +-
 .../shadows/2d.shadow.image.section.html      |    8 +-
 .../shadows/2d.shadow.image.section.worker.js |    8 +-
 .../2d.shadow.image.transparent.1.html        |    8 +-
 .../2d.shadow.image.transparent.1.worker.js   |    8 +-
 .../2d.shadow.image.transparent.2.html        |    8 +-
 .../2d.shadow.image.transparent.2.worker.js   |    8 +-
 .../shadows/2d.shadow.offset.negativeX.html   |    5 +-
 .../2d.shadow.offset.negativeX.worker.js      |    5 +-
 .../shadows/2d.shadow.offset.negativeY.html   |    5 +-
 .../2d.shadow.offset.negativeY.worker.js      |    5 +-
 .../shadows/2d.shadow.offset.positiveX.html   |    5 +-
 .../2d.shadow.offset.positiveX.worker.js      |    5 +-
 .../shadows/2d.shadow.offset.positiveY.html   |    5 +-
 .../2d.shadow.offset.positiveY.worker.js      |    5 +-
 .../shadows/2d.shadow.outside.html            |    5 +-
 .../shadows/2d.shadow.outside.worker.js       |    5 +-
 .../shadows/2d.shadow.pattern.alpha.html      |    8 +-
 .../shadows/2d.shadow.pattern.alpha.worker.js |    8 +-
 .../shadows/2d.shadow.pattern.basic.html      |    8 +-
 .../shadows/2d.shadow.pattern.basic.worker.js |    8 +-
 .../2d.shadow.pattern.transparent.1.html      |    8 +-
 .../2d.shadow.pattern.transparent.1.worker.js |    8 +-
 .../2d.shadow.pattern.transparent.2.html      |    8 +-
 .../2d.shadow.pattern.transparent.2.worker.js |    8 +-
 .../shadows/2d.shadow.stroke.basic.html       |    5 +-
 .../shadows/2d.shadow.stroke.basic.worker.js  |    5 +-
 .../shadows/2d.shadow.stroke.cap.1.html       |    5 +-
 .../shadows/2d.shadow.stroke.cap.1.worker.js  |    5 +-
 .../shadows/2d.shadow.stroke.cap.2.html       |    5 +-
 .../shadows/2d.shadow.stroke.cap.2.worker.js  |    5 +-
 .../shadows/2d.shadow.stroke.join.1.html      |    5 +-
 .../shadows/2d.shadow.stroke.join.1.worker.js |    5 +-
 .../shadows/2d.shadow.stroke.join.2.html      |    5 +-
 .../shadows/2d.shadow.stroke.join.2.worker.js |    5 +-
 .../shadows/2d.shadow.stroke.join.3.html      |    5 +-
 .../shadows/2d.shadow.stroke.join.3.worker.js |    5 +-
 .../shadows/2d.shadow.transform.1.html        |    5 +-
 .../shadows/2d.shadow.transform.1.worker.js   |    5 +-
 .../shadows/2d.shadow.transform.2.html        |    5 +-
 .../shadows/2d.shadow.transform.2.worker.js   |    5 +-
 .../text/2d.text.align.default.html           |    5 +-
 .../text/2d.text.align.default.worker.js      |    5 +-
 .../text/2d.text.align.invalid.html           |    5 +-
 .../text/2d.text.align.invalid.worker.js      |    5 +-
 .../text/2d.text.align.valid.html             |    5 +-
 .../text/2d.text.align.valid.worker.js        |    5 +-
 .../text/2d.text.baseline.default.html        |    5 +-
 .../text/2d.text.baseline.default.worker.js   |    5 +-
 .../text/2d.text.baseline.invalid.html        |    5 +-
 .../text/2d.text.baseline.invalid.worker.js   |    5 +-
 .../text/2d.text.baseline.valid.html          |    5 +-
 .../text/2d.text.baseline.valid.worker.js     |    5 +-
 .../text/2d.text.draw.align.center.html       |   12 +-
 .../text/2d.text.draw.align.center.worker.js  |   12 +-
 .../text/2d.text.draw.align.end.ltr.html      |   12 +-
 .../text/2d.text.draw.align.end.ltr.worker.js |   12 +-
 .../text/2d.text.draw.align.end.rtl.html      |   12 +-
 .../text/2d.text.draw.align.end.rtl.worker.js |   12 +-
 .../text/2d.text.draw.align.left.html         |   12 +-
 .../text/2d.text.draw.align.left.worker.js    |   12 +-
 .../text/2d.text.draw.align.right.html        |   12 +-
 .../text/2d.text.draw.align.right.worker.js   |   12 +-
 .../text/2d.text.draw.align.start.ltr.html    |   12 +-
 .../2d.text.draw.align.start.ltr.worker.js    |   12 +-
 .../text/2d.text.draw.align.start.rtl.html    |   12 +-
 .../2d.text.draw.align.start.rtl.worker.js    |   12 +-
 .../2d.text.draw.baseline.alphabetic.html     |   12 +-
 ...2d.text.draw.baseline.alphabetic.worker.js |   12 +-
 .../text/2d.text.draw.baseline.bottom.html    |   12 +-
 .../2d.text.draw.baseline.bottom.worker.js    |   12 +-
 .../text/2d.text.draw.baseline.hanging.html   |   12 +-
 .../2d.text.draw.baseline.hanging.worker.js   |   12 +-
 .../2d.text.draw.baseline.ideographic.html    |   12 +-
 ...d.text.draw.baseline.ideographic.worker.js |   12 +-
 .../text/2d.text.draw.baseline.middle.html    |   12 +-
 .../2d.text.draw.baseline.middle.worker.js    |   12 +-
 .../text/2d.text.draw.baseline.top.html       |   12 +-
 .../text/2d.text.draw.baseline.top.worker.js  |   12 +-
 .../text/2d.text.draw.fill.basic-manual.html  |    5 +-
 .../2d.text.draw.fill.basic-manual.worker.js  |    5 +-
 .../text/2d.text.draw.fill.maxWidth.NaN.html  |    5 +-
 .../2d.text.draw.fill.maxWidth.NaN.worker.js  |    5 +-
 .../2d.text.draw.fill.maxWidth.bound.html     |   12 +-
 ...2d.text.draw.fill.maxWidth.bound.worker.js |   12 +-
 .../2d.text.draw.fill.maxWidth.fontface.html  |   12 +-
 ...text.draw.fill.maxWidth.fontface.worker.js |   12 +-
 ....text.draw.fill.maxWidth.large-manual.html |    5 +-
 ....draw.fill.maxWidth.large-manual.worker.js |    5 +-
 .../2d.text.draw.fill.maxWidth.negative.html  |    5 +-
 ...text.draw.fill.maxWidth.negative.worker.js |    5 +-
 .../2d.text.draw.fill.maxWidth.small.html     |    5 +-
 ...2d.text.draw.fill.maxWidth.small.worker.js |    5 +-
 .../text/2d.text.draw.fill.maxWidth.zero.html |    5 +-
 .../2d.text.draw.fill.maxWidth.zero.worker.js |    5 +-
 .../text/2d.text.draw.fill.rtl-manual.html    |    5 +-
 .../2d.text.draw.fill.rtl-manual.worker.js    |    5 +-
 .../text/2d.text.draw.fill.unaffected.html    |    5 +-
 .../2d.text.draw.fill.unaffected.worker.js    |    5 +-
 .../text/2d.text.draw.fontface.html           |   12 +-
 .../text/2d.text.draw.fontface.notinpage.html |   12 +-
 .../2d.text.draw.fontface.notinpage.worker.js |   12 +-
 .../text/2d.text.draw.fontface.repeat.html    |   12 +-
 .../2d.text.draw.fontface.repeat.worker.js    |   12 +-
 .../text/2d.text.draw.fontface.worker.js      |   12 +-
 .../2d.text.draw.kern.consistent-manual.html  |    5 +-
 ...text.draw.kern.consistent-manual.worker.js |    5 +-
 .../text/2d.text.draw.space.basic.html        |   12 +-
 .../text/2d.text.draw.space.basic.worker.js   |   12 +-
 .../text/2d.text.draw.space.collapse.end.html |   12 +-
 .../2d.text.draw.space.collapse.end.worker.js |   12 +-
 .../2d.text.draw.space.collapse.nonspace.html |   12 +-
 ...ext.draw.space.collapse.nonspace.worker.js |   12 +-
 .../2d.text.draw.space.collapse.other.html    |   12 +-
 ...d.text.draw.space.collapse.other.worker.js |   12 +-
 .../2d.text.draw.space.collapse.space.html    |   12 +-
 ...d.text.draw.space.collapse.space.worker.js |   12 +-
 .../2d.text.draw.space.collapse.start.html    |   12 +-
 ...d.text.draw.space.collapse.start.worker.js |   12 +-
 .../2d.text.draw.stroke.basic-manual.html     |    5 +-
 ...2d.text.draw.stroke.basic-manual.worker.js |    5 +-
 .../text/2d.text.draw.stroke.unaffected.html  |    5 +-
 .../2d.text.draw.stroke.unaffected.worker.js  |    5 +-
 .../text/2d.text.font.default.html            |    5 +-
 .../text/2d.text.font.default.worker.js       |    5 +-
 .../text/2d.text.font.parse.basic.html        |    5 +-
 .../text/2d.text.font.parse.basic.worker.js   |    5 +-
 .../text/2d.text.font.parse.complex.html      |    5 +-
 .../text/2d.text.font.parse.complex.worker.js |    5 +-
 .../text/2d.text.font.parse.invalid.html      |    5 +-
 .../text/2d.text.font.parse.invalid.worker.js |    5 +-
 .../text/2d.text.font.parse.system.html       |    5 +-
 .../text/2d.text.font.parse.system.worker.js  |    5 +-
 .../text/2d.text.font.parse.tiny.html         |    5 +-
 .../text/2d.text.font.parse.tiny.worker.js    |    5 +-
 .../text/2d.text.font.relative_size.html      |    5 +-
 .../text/2d.text.font.relative_size.worker.js |    5 +-
 .../2d.text.measure.actualBoundingBox.html    |   41 +-
 ...d.text.measure.actualBoundingBox.worker.js |   41 +-
 .../text/2d.text.measure.advances.html        |   45 +-
 .../text/2d.text.measure.advances.worker.js   |   45 +-
 .../text/2d.text.measure.baselines.html       |   31 +-
 .../text/2d.text.measure.baselines.worker.js  |   31 +-
 .../text/2d.text.measure.emHeights.html       |   31 +-
 .../text/2d.text.measure.emHeights.worker.js  |   31 +-
 .../text/2d.text.measure.fontBoundingBox.html |   27 +-
 .../2d.text.measure.fontBoundingBox.worker.js |   27 +-
 .../text/2d.text.measure.width.basic.html     |   25 +-
 .../2d.text.measure.width.basic.worker.js     |   25 +-
 .../text/2d.text.measure.width.empty.html     |   17 +-
 .../2d.text.measure.width.empty.worker.js     |   17 +-
 .../text/2d.text.measure.width.space.html     |   27 +-
 .../2d.text.measure.width.space.worker.js     |   27 +-
 .../2d.state.saverestore.bitmap.html          |    5 +-
 .../2d.state.saverestore.bitmap.worker.js     |    5 +-
 .../2d.state.saverestore.clip.html            |    5 +-
 .../2d.state.saverestore.clip.worker.js       |    5 +-
 .../2d.state.saverestore.fillStyle.html       |    5 +-
 .../2d.state.saverestore.fillStyle.worker.js  |    5 +-
 .../2d.state.saverestore.globalAlpha.html     |    5 +-
 ...2d.state.saverestore.globalAlpha.worker.js |    5 +-
 ....saverestore.globalCompositeOperation.html |    5 +-
 ...restore.globalCompositeOperation.worker.js |    5 +-
 .../2d.state.saverestore.lineCap.html         |    5 +-
 .../2d.state.saverestore.lineCap.worker.js    |    5 +-
 .../2d.state.saverestore.lineJoin.html        |    5 +-
 .../2d.state.saverestore.lineJoin.worker.js   |    5 +-
 .../2d.state.saverestore.lineWidth.html       |    5 +-
 .../2d.state.saverestore.lineWidth.worker.js  |    5 +-
 .../2d.state.saverestore.miterLimit.html      |    5 +-
 .../2d.state.saverestore.miterLimit.worker.js |    5 +-
 .../2d.state.saverestore.path.html            |    5 +-
 .../2d.state.saverestore.path.worker.js       |    5 +-
 .../2d.state.saverestore.shadowBlur.html      |    5 +-
 .../2d.state.saverestore.shadowBlur.worker.js |    5 +-
 .../2d.state.saverestore.shadowColor.html     |    5 +-
 ...2d.state.saverestore.shadowColor.worker.js |    5 +-
 .../2d.state.saverestore.shadowOffsetX.html   |    5 +-
 ....state.saverestore.shadowOffsetX.worker.js |    5 +-
 .../2d.state.saverestore.shadowOffsetY.html   |    5 +-
 ....state.saverestore.shadowOffsetY.worker.js |    5 +-
 .../2d.state.saverestore.stack.html           |    5 +-
 .../2d.state.saverestore.stack.worker.js      |    5 +-
 .../2d.state.saverestore.stackdepth.html      |    5 +-
 .../2d.state.saverestore.stackdepth.worker.js |    5 +-
 .../2d.state.saverestore.strokeStyle.html     |    5 +-
 ...2d.state.saverestore.strokeStyle.worker.js |    5 +-
 .../2d.state.saverestore.transformation.html  |    5 +-
 ...state.saverestore.transformation.worker.js |    5 +-
 .../2d.state.saverestore.underflow.html       |    5 +-
 .../2d.state.saverestore.underflow.worker.js  |    5 +-
 .../2d.canvas.readonly.html                   |    5 +-
 .../2d.canvas.readonly.worker.js              |    5 +-
 .../2d.canvas.reference.html                  |    5 +-
 .../2d.canvas.reference.worker.js             |    5 +-
 .../2d.getcontext.exists.html                 |    5 +-
 .../2d.getcontext.exists.worker.js            |    5 +-
 .../2d.getcontext.extraargs.html              |    5 +-
 .../2d.getcontext.extraargs.worker.js         |    5 +-
 .../2d.getcontext.shared.html                 |    5 +-
 .../2d.getcontext.shared.worker.js            |    5 +-
 .../2d.getcontext.unique.html                 |    5 +-
 .../2d.getcontext.unique.worker.js            |    5 +-
 .../context.arguments.missing.html            |    5 +-
 .../context.arguments.missing.worker.js       |    5 +-
 .../context.casesensitive.html                |    5 +-
 .../context.casesensitive.worker.js           |    5 +-
 .../context.emptystring.html                  |    5 +-
 .../context.emptystring.worker.js             |    5 +-
 .../context.unrecognised.badname.html         |    5 +-
 .../context.unrecognised.badname.worker.js    |    5 +-
 .../context.unrecognised.badsuffix.html       |    5 +-
 .../context.unrecognised.badsuffix.worker.js  |    5 +-
 .../context.unrecognised.nullsuffix.html      |    5 +-
 .../context.unrecognised.nullsuffix.worker.js |    5 +-
 .../context.unrecognised.unicode.html         |    5 +-
 .../context.unrecognised.unicode.worker.js    |    5 +-
 .../the-offscreen-canvas/initial.colour.html  |    5 +-
 .../initial.colour.worker.js                  |    5 +-
 .../initial.reset.2dstate.html                |    5 +-
 .../initial.reset.2dstate.worker.js           |    5 +-
 .../initial.reset.clip.html                   |    5 +-
 .../initial.reset.clip.worker.js              |    5 +-
 .../initial.reset.different.html              |    5 +-
 .../initial.reset.different.worker.js         |    5 +-
 .../initial.reset.gradient.html               |    5 +-
 .../initial.reset.gradient.worker.js          |    5 +-
 .../initial.reset.path.html                   |    5 +-
 .../initial.reset.path.worker.js              |    5 +-
 .../initial.reset.pattern.html                |    5 +-
 .../initial.reset.pattern.worker.js           |    5 +-
 .../initial.reset.same.html                   |    5 +-
 .../initial.reset.same.worker.js              |    5 +-
 .../initial.reset.transform.html              |    5 +-
 .../initial.reset.transform.worker.js         |    5 +-
 .../size.attributes.default.html              |    5 +-
 .../size.attributes.default.worker.js         |    5 +-
 .../size.attributes.idl.html                  |    5 +-
 .../size.attributes.idl.set.zero.html         |    5 +-
 .../size.attributes.idl.set.zero.worker.js    |    5 +-
 .../size.attributes.idl.worker.js             |    5 +-
 .../size.attributes.parse.decimal.html        |    5 +-
 .../size.attributes.parse.decimal.worker.js   |    5 +-
 .../size.attributes.parse.em.html             |    5 +-
 .../size.attributes.parse.em.worker.js        |    5 +-
 .../size.attributes.parse.empty.html          |    5 +-
 .../size.attributes.parse.empty.worker.js     |    5 +-
 .../size.attributes.parse.exp.html            |    5 +-
 .../size.attributes.parse.exp.worker.js       |    5 +-
 .../size.attributes.parse.hex.html            |    5 +-
 .../size.attributes.parse.hex.worker.js       |    5 +-
 .../size.attributes.parse.junk.html           |    5 +-
 .../size.attributes.parse.junk.worker.js      |    5 +-
 .../size.attributes.parse.minus.html          |    5 +-
 .../size.attributes.parse.minus.worker.js     |    5 +-
 .../size.attributes.parse.octal.html          |    5 +-
 .../size.attributes.parse.octal.worker.js     |    5 +-
 .../size.attributes.parse.onlyspace.html      |    5 +-
 .../size.attributes.parse.onlyspace.worker.js |    5 +-
 .../size.attributes.parse.percent.html        |    5 +-
 .../size.attributes.parse.percent.worker.js   |    5 +-
 .../size.attributes.parse.plus.html           |    5 +-
 .../size.attributes.parse.plus.worker.js      |    5 +-
 .../size.attributes.parse.space.html          |    5 +-
 .../size.attributes.parse.space.worker.js     |    5 +-
 .../size.attributes.parse.trailingjunk.html   |    5 +-
 ...ze.attributes.parse.trailingjunk.worker.js |    5 +-
 .../size.attributes.parse.whitespace.html     |    5 +-
 ...size.attributes.parse.whitespace.worker.js |    5 +-
 .../size.attributes.parse.zero.html           |    5 +-
 .../size.attributes.parse.zero.worker.js      |    5 +-
 .../size.attributes.reflect.setidl.html       |    5 +-
 .../size.attributes.reflect.setidl.worker.js  |    5 +-
 .../size.attributes.reflect.setidlzero.html   |    5 +-
 ...ze.attributes.reflect.setidlzero.worker.js |    5 +-
 .../the-offscreen-canvas/size.large.html      |    5 +-
 .../the-offscreen-canvas/size.large.worker.js |    5 +-
 .../offscreen-canvas/tools/templates.yaml     |   12 +-
 .../offscreen-canvas/tools/tests2d.yaml       |  938 +++-
 .../2d.transformation.order.html              |    5 +-
 .../2d.transformation.order.worker.js         |    5 +-
 .../2d.transformation.rotate.direction.html   |    5 +-
 ....transformation.rotate.direction.worker.js |    5 +-
 .../2d.transformation.rotate.nonfinite.html   |    5 +-
 ....transformation.rotate.nonfinite.worker.js |    5 +-
 .../2d.transformation.rotate.radians.html     |    5 +-
 ...2d.transformation.rotate.radians.worker.js |    5 +-
 .../2d.transformation.rotate.wrap.html        |    5 +-
 .../2d.transformation.rotate.wrap.worker.js   |    5 +-
 ...2d.transformation.rotate.wrapnegative.html |    5 +-
 ...ansformation.rotate.wrapnegative.worker.js |    5 +-
 .../2d.transformation.rotate.zero.html        |    5 +-
 .../2d.transformation.rotate.zero.worker.js   |    5 +-
 .../2d.transformation.scale.basic.html        |    5 +-
 .../2d.transformation.scale.basic.worker.js   |    5 +-
 .../2d.transformation.scale.large.html        |    5 +-
 .../2d.transformation.scale.large.worker.js   |    5 +-
 .../2d.transformation.scale.multiple.html     |    5 +-
 ...2d.transformation.scale.multiple.worker.js |    5 +-
 .../2d.transformation.scale.negative.html     |    5 +-
 ...2d.transformation.scale.negative.worker.js |    5 +-
 .../2d.transformation.scale.nonfinite.html    |    5 +-
 ...d.transformation.scale.nonfinite.worker.js |    5 +-
 .../2d.transformation.scale.zero.html         |    5 +-
 .../2d.transformation.scale.zero.worker.js    |    5 +-
 ....transformation.setTransform.multiple.html |    5 +-
 ...sformation.setTransform.multiple.worker.js |    5 +-
 ...transformation.setTransform.nonfinite.html |    5 +-
 ...formation.setTransform.nonfinite.worker.js |    5 +-
 ...2d.transformation.setTransform.skewed.html |    5 +-
 ...ansformation.setTransform.skewed.worker.js |    5 +-
 .../2d.transformation.transform.identity.html |    5 +-
 ...ransformation.transform.identity.worker.js |    5 +-
 .../2d.transformation.transform.multiply.html |    5 +-
 ...ransformation.transform.multiply.worker.js |    5 +-
 ...2d.transformation.transform.nonfinite.html |    5 +-
 ...ansformation.transform.nonfinite.worker.js |    5 +-
 .../2d.transformation.transform.skewed.html   |    5 +-
 ....transformation.transform.skewed.worker.js |    5 +-
 .../2d.transformation.translate.basic.html    |    5 +-
 ...d.transformation.translate.basic.worker.js |    5 +-
 ...2d.transformation.translate.nonfinite.html |    5 +-
 ...ansformation.translate.nonfinite.worker.js |    5 +-
 .../resources/testdriver.js                   |   44 +
 .../svg/animations/cyclic-syncbase-2.html     |    8 +-
 .../animations/cyclic-syncbase-events.html    |   30 +
 .../svg/animations/seeking-to-large-time.html |   24 +
 .../tc/testdata/epochs_daily_push_event.json  |  460 ++
 .../tools/ci/tc/tests/test_valid.py           |   77 +-
 .../wptrunner/wptrunner/executors/base.py     |   15 +
 .../wptrunner/executors/executorwebdriver.py  |   19 +
 .../wptrunner/wptrunner/executors/protocol.py |   16 +
 .../wptrunner/wptrunner/testdriver-extra.js   |    9 +
 .../webdriver/tests/send_alert_text/send.py   |    8 -
 .../webdriver/tests/set_window_rect/set.py    |    4 +-
 .../webxr/xrFrame_getPose.https.html          |   32 +-
 2000 files changed, 13338 insertions(+), 5112 deletions(-)
 create mode 100644 tests/wpt/metadata/css/cssom/cssimportrule-parent.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom/cssimportrule-sheet-identity.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.html.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js.ini
 create mode 100644 tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/size.large.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/fixed-size-child-with-overflow.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom/cssimportrule-parent.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom/cssimportrule-sheet-identity.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom/support/import-rule.css
 delete mode 100644 tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/README.md
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/data-base-url.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/overlapping-entries.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/packages-via-trailing-slashes.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/scopes-exact-vs-prefix.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/scopes.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/tricky-specifiers.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/resources/url-specifiers.json
 create mode 100644 tests/wpt/web-platform-tests/import-maps/common/tools/format_json.py
 delete mode 100644 tests/wpt/web-platform-tests/import-maps/imported/resolving-scopes.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/import-maps/imported/resolving.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/import-maps/imported/resources/resolving-scopes.js
 delete mode 100644 tests/wpt/web-platform-tests/import-maps/imported/resources/resolving.js
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/set_permission.html.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/testdriver/set_permission.html
 create mode 100644 tests/wpt/web-platform-tests/longtask-timing/containerTypes.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-events.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/seeking-to-large-time.html
 create mode 100644 tests/wpt/web-platform-tests/tools/ci/tc/testdata/epochs_daily_push_event.json

diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index 76b398963ae..a9e46713244 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: FAIL
diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 4c1aa18e695..f28a19f1250 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -10,6 +10,3 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index f28477c82e8..3081e9d40de 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -133141,6 +133141,18 @@
      {}
     ]
    ],
+   "css/css-multicol/fixed-size-child-with-overflow.html": [
+    [
+     "css/css-multicol/fixed-size-child-with-overflow.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-multicol/float-and-block.html": [
     [
      "css/css-multicol/float-and-block.html",
@@ -135709,6 +135721,18 @@
      {}
     ]
    ],
+   "css/css-multicol/nested-with-too-tall-line.html": [
+    [
+     "css/css-multicol/nested-with-too-tall-line.html",
+     [
+      [
+       "/css/css-multicol/nested-with-too-tall-line-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html": [
     [
      "css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html",
@@ -139213,6 +139237,38 @@
      {}
     ]
    ],
+   "css/css-pseudo/marker-font-variant-numeric-default.html": [
+    [
+     "css/css-pseudo/marker-font-variant-numeric-default.html",
+     [
+      [
+       "/css/css-pseudo/marker-font-variant-numeric-default-ref.html",
+       "=="
+      ],
+      [
+       "/css/css-pseudo/marker-font-variant-numeric-normal-ref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-pseudo/marker-font-variant-numeric-normal.html": [
+    [
+     "css/css-pseudo/marker-font-variant-numeric-normal.html",
+     [
+      [
+       "/css/css-pseudo/marker-font-variant-numeric-normal-ref.html",
+       "=="
+      ],
+      [
+       "/css/css-pseudo/marker-font-variant-numeric-default-ref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-pseudo/marker-inherit-line-height.html": [
     [
      "css/css-pseudo/marker-inherit-line-height.html",
@@ -139249,6 +139305,38 @@
      {}
     ]
    ],
+   "css/css-pseudo/marker-unicode-bidi-default.html": [
+    [
+     "css/css-pseudo/marker-unicode-bidi-default.html",
+     [
+      [
+       "/css/css-pseudo/marker-unicode-bidi-default-ref.html",
+       "=="
+      ],
+      [
+       "/css/css-pseudo/marker-unicode-bidi-normal-ref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-pseudo/marker-unicode-bidi-normal.html": [
+    [
+     "css/css-pseudo/marker-unicode-bidi-normal.html",
+     [
+      [
+       "/css/css-pseudo/marker-unicode-bidi-normal-ref.html",
+       "=="
+      ],
+      [
+       "/css/css-pseudo/marker-unicode-bidi-default-ref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-pseudo/outside-marker-paint-order.html": [
     [
      "css/css-pseudo/outside-marker-paint-order.html",
@@ -156142,7 +156230,11 @@
      "css/css-text/word-break/word-break-break-all-inline-006.html",
      [
       [
-       "/css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html",
+       "/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html",
+       "=="
+      ],
+      [
+       "/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html",
        "=="
       ]
      ],
@@ -254289,6 +254381,9 @@
    "css/css-multicol/multicol-zero-height-001-ref.xht": [
     []
    ],
+   "css/css-multicol/nested-with-too-tall-line-ref.html": [
+    []
+   ],
    "css/css-multicol/reference/multicol-basic-005-ref.xht": [
     []
    ],
@@ -255042,6 +255137,12 @@
    "css/css-pseudo/marker-font-properties-ref.html": [
     []
    ],
+   "css/css-pseudo/marker-font-variant-numeric-default-ref.html": [
+    []
+   ],
+   "css/css-pseudo/marker-font-variant-numeric-normal-ref.html": [
+    []
+   ],
    "css/css-pseudo/marker-inherit-line-height-ref.html": [
     []
    ],
@@ -255051,6 +255152,12 @@
    "css/css-pseudo/marker-list-style-position-ref.html": [
     []
    ],
+   "css/css-pseudo/marker-unicode-bidi-default-ref.html": [
+    []
+   ],
+   "css/css-pseudo/marker-unicode-bidi-normal-ref.html": [
+    []
+   ],
    "css/css-pseudo/outside-marker-paint-order-ref.html": [
     []
    ],
@@ -258531,7 +258638,10 @@
    "css/css-text/word-break/reference/word-break-break-all-inline-005-ref.html": [
     []
    ],
-   "css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html": [
+   "css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html": [
+    []
+   ],
+   "css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html": [
     []
    ],
    "css/css-text/word-break/reference/word-break-break-all-inline-007-ref.html": [
@@ -262740,6 +262850,9 @@
    "css/cssom/support/import-red.css": [
     []
    ],
+   "css/cssom/support/import-rule.css": [
+    []
+   ],
    "css/cssom/support/malformed-http-response.asis": [
     []
    ],
@@ -276510,6 +276623,39 @@
    "import-maps/builtin-support.tentative/static-import.py": [
     []
    ],
+   "import-maps/common/README.md": [
+    []
+   ],
+   "import-maps/common/resources/common-test-helper.js": [
+    []
+   ],
+   "import-maps/common/resources/data-base-url.json": [
+    []
+   ],
+   "import-maps/common/resources/empty-import-map.json": [
+    []
+   ],
+   "import-maps/common/resources/overlapping-entries.json": [
+    []
+   ],
+   "import-maps/common/resources/packages-via-trailing-slashes.json": [
+    []
+   ],
+   "import-maps/common/resources/scopes-exact-vs-prefix.json": [
+    []
+   ],
+   "import-maps/common/resources/scopes.json": [
+    []
+   ],
+   "import-maps/common/resources/tricky-specifiers.json": [
+    []
+   ],
+   "import-maps/common/resources/url-specifiers.json": [
+    []
+   ],
+   "import-maps/common/tools/format_json.py": [
+    []
+   ],
    "import-maps/core/bare/__dir__.headers": [
     []
    ],
@@ -276543,12 +276689,6 @@
    "import-maps/imported/resources/parsing-specifier-keys.js": [
     []
    ],
-   "import-maps/imported/resources/resolving-scopes.js": [
-    []
-   ],
-   "import-maps/imported/resources/resolving.js": [
-    []
-   ],
    "import-maps/resources/empty.js": [
     []
    ],
@@ -276732,6 +276872,9 @@
    "infrastructure/metadata/infrastructure/testdriver/generate_test_report.html.ini": [
     []
    ],
+   "infrastructure/metadata/infrastructure/testdriver/set_permission.html.ini": [
+    []
+   ],
    "infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini": [
     []
    ],
@@ -285084,6 +285227,9 @@
    "tools/ci/tc/tasks/test.yml": [
     []
    ],
+   "tools/ci/tc/testdata/epochs_daily_push_event.json": [
+    []
+   ],
    "tools/ci/tc/testdata/master_push_event.json": [
     []
    ],
@@ -326167,6 +326313,12 @@
      {}
     ]
    ],
+   "css/css-pseudo/marker-default-styles.html": [
+    [
+     "css/css-pseudo/marker-default-styles.html",
+     {}
+    ]
+   ],
    "css/css-pseudo/parsing/marker-supported-properties.html": [
     [
      "css/css-pseudo/parsing/marker-supported-properties.html",
@@ -335775,6 +335927,18 @@
      {}
     ]
    ],
+   "css/cssom/cssimportrule-parent.html": [
+    [
+     "css/cssom/cssimportrule-parent.html",
+     {}
+    ]
+   ],
+   "css/cssom/cssimportrule-sheet-identity.html": [
+    [
+     "css/cssom/cssimportrule-sheet-identity.html",
+     {}
+    ]
+   ],
    "css/cssom/cssimportrule.html": [
     [
      "css/cssom/cssimportrule.html",
@@ -357757,12 +357921,6 @@
      {}
     ]
    ],
-   "html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html": [
-    [
-     "html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html",
-     {}
-    ]
-   ],
    "html/browsers/windows/document-access/document_access_parent_access.tentative.html": [
     [
      "html/browsers/windows/document-access/document_access_parent_access.tentative.html",
@@ -370804,6 +370962,14 @@
      {}
     ]
    ],
+   "import-maps/common/resolving.tentative.html": [
+    [
+     "import-maps/common/resolving.tentative.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
    "import-maps/core/bare.sub.tentative.html": [
     [
      "import-maps/core/bare.sub.tentative.html",
@@ -370904,18 +371070,6 @@
      {}
     ]
    ],
-   "import-maps/imported/resolving-scopes.tentative.html": [
-    [
-     "import-maps/imported/resolving-scopes.tentative.html",
-     {}
-    ]
-   ],
-   "import-maps/imported/resolving.tentative.html": [
-    [
-     "import-maps/imported/resolving.tentative.html",
-     {}
-    ]
-   ],
    "inert/inert-does-not-match-disabled-selector.tentative.html": [
     [
      "inert/inert-does-not-match-disabled-selector.tentative.html",
@@ -371475,6 +371629,14 @@
      }
     ]
    ],
+   "infrastructure/testdriver/set_permission.html": [
+    [
+     "infrastructure/testdriver/set_permission.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "infrastructure/testdriver/virtual_authenticator.html": [
     [
      "infrastructure/testdriver/virtual_authenticator.html",
@@ -372597,6 +372759,12 @@
      {}
     ]
    ],
+   "longtask-timing/containerTypes.html": [
+    [
+     "longtask-timing/containerTypes.html",
+     {}
+    ]
+   ],
    "longtask-timing/idlharness.window.js": [
     [
      "longtask-timing/idlharness.window.html",
@@ -415446,6 +415614,12 @@
      {}
     ]
    ],
+   "svg/animations/cyclic-syncbase-events.html": [
+    [
+     "svg/animations/cyclic-syncbase-events.html",
+     {}
+    ]
+   ],
    "svg/animations/cyclic-syncbase.html": [
     [
      "svg/animations/cyclic-syncbase.html",
@@ -415572,6 +415746,12 @@
      {}
     ]
    ],
+   "svg/animations/seeking-to-large-time.html": [
+    [
+     "svg/animations/seeking-to-large-time.html",
+     {}
+    ]
+   ],
    "svg/animations/short-simple-duration-and-fractional-repeatcount.html": [
     [
      "svg/animations/short-simple-duration-and-fractional-repeatcount.html",
@@ -467184,7 +467364,7 @@
    "testharness"
   ],
   "PeriodicBackgroundSync/periodicsync.https.window.js": [
-   "30384e0b3e4dd4b42dd627dc0d1ef69c63e6bc87",
+   "a9aebdbfe891b5175c8b85d7da9ff75269b619fe",
    "testharness"
   ],
   "PeriodicBackgroundSync/service_workers/sw.js": [
@@ -467192,7 +467372,7 @@
    "support"
   ],
   "README.md": [
-   "8f755f2ac2fc88e012b32803fc65a68baa538596",
+   "3b580da869015b968668bec6a26f3137f4a020a0",
    "support"
   ],
   "WebCryptoAPI/META.yml": [
@@ -491692,7 +491872,7 @@
    "support"
   ],
   "content-security-policy/reporting/report-only-unsafe-eval.html": [
-   "ebaf6941a898e88a96ec61e8742fd63375811c27",
+   "9effbc69d61070cf56305fa1cc9ee7ec66f357d5",
    "testharness"
   ],
   "content-security-policy/reporting/report-only-unsafe-eval.html.sub.headers": [
@@ -583831,6 +584011,10 @@
    "763bf1fc5a13ba86f440155aa0373357bf7782cb",
    "testharness"
   ],
+  "css/css-multicol/fixed-size-child-with-overflow.html": [
+   "60300c3cd65ba455eb6ef7ab29bf5bc2ec6e4166",
+   "reftest"
+  ],
   "css/css-multicol/float-and-block.html": [
    "21f9fb97436be415dfad77a83f2c1f085dbc0700",
    "reftest"
@@ -585331,6 +585515,14 @@
    "bea27a95781c3dd4abf0d590fd15d64530fd9154",
    "reftest"
   ],
+  "css/css-multicol/nested-with-too-tall-line-ref.html": [
+   "16be12ca9187db02482a15d47e0ae9015a84959c",
+   "support"
+  ],
+  "css/css-multicol/nested-with-too-tall-line.html": [
+   "67a289ca558af4814906faa4a6b2cb40f25a1860",
+   "reftest"
+  ],
   "css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html": [
    "b087f56ac6e06d7e11d719976ae66459c97722d7",
    "reftest"
@@ -588231,6 +588423,10 @@
    "0cc20b0cdcd242021bc37b9e2d3500ed21c5b35f",
    "reftest"
   ],
+  "css/css-pseudo/marker-default-styles.html": [
+   "05da6f89a9e2f858eadfdfb63e5194feda5ce3fc",
+   "testharness"
+  ],
   "css/css-pseudo/marker-display-dynamic-001.html": [
    "c06da7ca803455559a7a12b915d9083b32106cd1",
    "reftest"
@@ -588243,6 +588439,22 @@
    "4dd780679845a34699f31febd927dc3b774a5ffd",
    "reftest"
   ],
+  "css/css-pseudo/marker-font-variant-numeric-default-ref.html": [
+   "4a3dd1965876f7bcc0506cf99e4e6ba6748f4260",
+   "support"
+  ],
+  "css/css-pseudo/marker-font-variant-numeric-default.html": [
+   "037ec8a0c3c628d696f413d78c833bf29831a7c1",
+   "reftest"
+  ],
+  "css/css-pseudo/marker-font-variant-numeric-normal-ref.html": [
+   "db5923cda20adf9c128b3e4252f7fec2b1ac5ffa",
+   "support"
+  ],
+  "css/css-pseudo/marker-font-variant-numeric-normal.html": [
+   "d135afe41eb1e208d0ac5a3c303af43a87851df9",
+   "reftest"
+  ],
   "css/css-pseudo/marker-inherit-line-height-ref.html": [
    "9bd8ca874a02bb4f9e87eeb347525e5ec6673ac2",
    "support"
@@ -588267,6 +588479,22 @@
    "5b4391d4e7e43c330eb848ca29645b8c820c02de",
    "reftest"
   ],
+  "css/css-pseudo/marker-unicode-bidi-default-ref.html": [
+   "71e81474ce175bbad5765171bb558ded77fdffb0",
+   "support"
+  ],
+  "css/css-pseudo/marker-unicode-bidi-default.html": [
+   "00d4d28e7d00d24930c19dbbd91f0442dafbc4d1",
+   "reftest"
+  ],
+  "css/css-pseudo/marker-unicode-bidi-normal-ref.html": [
+   "825c601ed4c7a47380992fa89975d848b7870436",
+   "support"
+  ],
+  "css/css-pseudo/marker-unicode-bidi-normal.html": [
+   "ec01afa4a194f9f0c44b4877c7265eafc8cdce0e",
+   "reftest"
+  ],
   "css/css-pseudo/outside-marker-paint-order-ref.html": [
    "441a354732fc6690ea0d8af93dd33d57c8049374",
    "support"
@@ -590956,7 +591184,7 @@
    "testharness"
   ],
   "css/css-scroll-anchoring/infinite-scroll-event.tentative.html": [
-   "80fcc4cca0c89cbfd6436cc00193e7943988b23a",
+   "4bc222f4e72d890355c3f52a70b94ff9de1ac17f",
    "testharness"
   ],
   "css/css-scroll-anchoring/inheritance.html": [
@@ -600136,67 +600364,67 @@
    "reftest"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html": [
-   "855ec1e87a9434dbedf9248e492ab125ef6fac6c",
+   "4e78815599ea98a506cbc2e8df1e6b241d50aa72",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html": [
-   "8ef0497f50f2df377e23b69e35f4bcdc4733c944",
+   "61e612461d111bed7ba98fe4e87c4df3fbee566b",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html": [
-   "b7ac094cc29346f0319194fd59606f4b61d41d49",
+   "cb49f01a9822c0b42f048d50961a68723e51e1f5",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html": [
-   "d68fac13de6f78e1ffedc6af14d728c78bcb1f01",
+   "97fc57362888545062ced1f0b68b8db61d20a6d5",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html": [
-   "859e033ae766bf4a09680a8fe4817a6adbe2080f",
+   "4629db93b6c45ed70498df075bfb417dfb2bda0a",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html": [
-   "9c5e4e6f97e9e82f424ec0d4f0de4e2b568a811c",
+   "001269158d321e76591eed6e863a8c6b1edd48de",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html": [
-   "65496f1019d852a8556847652cf2104fe2ac7674",
+   "0a899e240c12a4502458a3b8c427ee8447f0b776",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html": [
-   "606a463874f55312735be3dcbd1ca18e3b7d6173",
+   "a49ce9cdcf9dbdbda6e95a2fc988e6d1562f44e6",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html": [
-   "1e3e331ca543ccface9ebad463b773f593d5b7ad",
+   "7ce2570948145da9428f1715fb8231e7b89645c4",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html": [
-   "90dbfd73bbc40d92cf6a9a218cb0e428f2337bf7",
+   "b5dde82a1131027206ae2695bbd60e2e66378917",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html": [
-   "075aca4a57d793f20db69a7c2845e6dcc3364393",
+   "9eb1d181243dd32e64109e2e35716a03d783d179",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html": [
-   "984e703a5c49b24e82e77f92d9aabcc2fc43bd66",
+   "a07c35b10e8090ad4c0ce964ac3fe2cfcf19f554",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html": [
-   "3754845856b3c5121a2c16e5f1d6ce800735f0fc",
+   "d115bf09b8813f117c3cb52d621e24b8ff8f04fd",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html": [
-   "2c43f5f45f8cca9d4f2766e01d3bb407c801a87d",
+   "157c19cf1f783156dd99c6903a872bdeeb300d49",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html": [
-   "653386289dd88a61d8350af87ead8e0dec0bbc22",
+   "21e19d1715e62fa4dfc47244d7e916b6b87d380b",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html": [
-   "e848e64622d0a9fdb9bb66970efc51a0fcb19cfa",
+   "96240cae72f27afb49d54e022cc2ad545d5cb378",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-capitalize-031-ref.html": [
@@ -600300,139 +600528,139 @@
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html": [
-   "9f990b7479ab7b38325529519f79b5b1749e9e3c",
+   "1c5fa0a981a0b0ec3185bb27fd7f6565160a38ed",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html": [
-   "2f32a815a09b57ef9e80361864301fe1918bf1cf",
+   "8418d39731ec2a2c595ce98fd05df63088482be7",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html": [
-   "6df7d7d8f5ed4caee6e1fe434fa0ad768332eb85",
+   "9793a95dd3a265274dbed1fa09328445df94532b",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html": [
-   "c43a76641091625e7674f4ecc3332a7cab541565",
+   "dae2e050ec0d7d32e416ef4462224543960ef756",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html": [
-   "2b686f4896cfcb7582322fbde4eea253f8de1175",
+   "9ce44d1e5544741dc19b634615b185949c5e1ddd",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html": [
-   "2a43c803b91f7dbbc40437873e3840c0656b9f24",
+   "61c4d240cd5797f95fb9fb3c1e15cefe8f6cdeef",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html": [
-   "d2f5640195b484a1af90e7221a9b0f284d29cd4b",
+   "6f98a12cbd368d520850a85f45e83a6c2b032e5f",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html": [
-   "7a98633c386e9e327e16d742cfba49b041b41fd5",
+   "1ea4aa60c130348c5b9a6ca6754c567e16ac98c7",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html": [
-   "b03e2015c1d2c8409b52af5a146466e33f915f8e",
+   "e3a68081760a43eeeb931cddb6bc7f274a588302",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html": [
-   "feace76b8e3c8dc58e7efdba1804785ec440432e",
+   "4554c2834e3ba0b130210744235d80e9f775d878",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html": [
-   "25aca08eaa8b73a8b9c3e1b3b261fc6e8479cdde",
+   "e5dad75eb07646399e8c0f2e5492a1c4516fd850",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html": [
-   "ba83c03b38de2855ade1e8f66ecd4a3a53a1051b",
+   "e7a56f7c90d0590c852b291aae17e26d06e0fcec",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html": [
-   "c22131c0bed39bf8ed9a90346896fa01c1694a34",
+   "cd42f018b0120e26ff724033089be81fc2f0f897",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html": [
-   "332845b11387375ecb970537f884ce15ccd7e212",
+   "4c33e53cf99d5500c71cf67c0fd9b4f408d671d9",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html": [
-   "e5f2e6549ded652188a47beead97bc401931408b",
+   "ac68840c78a7e4edd18c71a9c6eb5c47bdfcea0c",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html": [
-   "da8ada0d28ad200fd77ac7323207ff2fcd2ad006",
+   "c2b583b6891ebcc34f256cde87fd1f6be656f43c",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html": [
-   "b53b0d1b9a925c41f965d752d58c25565b5680fc",
+   "eeebd0a681304ee245cc8c4515132ed7e5ed068f",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html": [
-   "84b72feea54b73d3e3253645d589ee3aa669dfe4",
+   "69272200dda1679fb924b18663014c526a2e51b0",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html": [
-   "47d2e6d9bb0be21f14bf0ce737bbf056f0eb38a6",
+   "1dbad5ed81869a3217365b92aaf1d3727766f02c",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html": [
-   "64d7929c5f4a770af333145a903d46f00046f89c",
+   "17fd94a6fe5249f73a30e1b76e447a7b620b1d87",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html": [
-   "94c44df696bff97c411bb8212af8c67b8c67a9f8",
+   "7a025ca223d27f12f67f6e9ae6edc32c39ffd04b",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html": [
-   "70f45dca8c5d836cf6abe7217ead51574823be38",
+   "4108fc090c9c345378f6054e9505276878b3a42c",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html": [
-   "77380841ff06863b8de229d7dda7e43c21052df9",
+   "f5a403f6702f5206a03d6215e314fe4a9878b924",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html": [
-   "d7fdd0a8a2ac73475f1bd49be6693dcf77bd3d6f",
+   "a4bb76e8451012bf661bbc98dfd88b68f1b424e4",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html": [
-   "ce4e9e4be9ee9aee68182b7c44c4187792f6cfde",
+   "d5afb862a4162374ea4be659abb9c29ad800d651",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html": [
-   "08b3fd3d8c64c2c6bbd23510955206a247655e34",
+   "b1f5f17bf5fe3571e2a9aa4edc4c162c51e235a5",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html": [
-   "e4d900aeb77c6a1b1f78fb80f480edba20954973",
+   "93d1103ce0cf86a2ff28f27f0676a0ddd2677d08",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html": [
-   "d7658c9027a7552d64558996b5a7dfdc4efa8d43",
+   "565f2682f6a789fd8b45373aeb649afc0047bfd3",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html": [
-   "45460bc49dc0da3c76d6ee5f48c9ed7c4c58429d",
+   "b935ce02cc7e53086bca678c56c28f2c80bfc9f3",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html": [
-   "f5eb0ade748bf546a3999741af4f1d4d5330f081",
+   "047dfe40537e470aa54a026977c386669f8cb40f",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html": [
-   "d2db630034051205256502b893853273f78436c0",
+   "86fb97134ac71ec12199510bd085a6d43f65a05a",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html": [
-   "b0364476e637e0f5e793dd40f61908a8b4d89629",
+   "e09c1a0f5c77aee544540dbfa8afa695c472f7ed",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html": [
-   "680c663734cc36bb1aeec624f826d70c3c85a708",
+   "b3157486c3cfb093a4b5cbf9178afa54db286d75",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html": [
-   "bcfe1504ad9588190540d2a670a94de91dbe42b6",
+   "e050170986e812a678faa7e9b47f3af845884b41",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-038-ref.html": [
@@ -600440,107 +600668,107 @@
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html": [
-   "f4fb6804434e02f283fe036e8a110a5652fc8cb3",
+   "f97ce02b5612533d4e5891ef99efc2be883d6748",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html": [
-   "f2624f13f63402df34b55f8275b702c85fea4b21",
+   "1d8941c9b0cb775a9ff7341600c50d91955df5fe",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html": [
-   "8b784924a14b6e4d06e1f8d652b8f66d30685110",
+   "2502097be2199785b91c7e772ec15c5bc7f840bf",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html": [
-   "2277c4fe334ffb1a8ed9cc9655956af225bf385c",
+   "ea15bd474f81d116f971e261b0b84d1794c55511",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html": [
-   "5c5e18c2f7451fb5a236c9fae6344786a65336b3",
+   "ea8325b1850579d03dde262dc1a5c4c06e02fba7",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html": [
-   "3eed1edb80e628c28f6a483db4a6980a4b36064e",
+   "b4590eb88aedf6207277ecf6ab17286325fbb475",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html": [
-   "0105b021d468598eec8e48de849d4764a9e517af",
+   "af2673405f309fd5f75bb5d846d41f3880d91552",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html": [
-   "adcc9a3a5e14f7a969a983049ecaf7463703d657",
+   "5f915e30193c46b9dee2590c1399bff205057ce1",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html": [
-   "30ecf1e199dcd2cf574747eac4e800bd0f46846c",
+   "5b6f7980ed4c47fc5483117d49874b2fd6118d51",
    "support"
   ],
   "css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html": [
-   "52245cb150ce0d40679fee4fdda74f8d7def211c",
+   "6c8bb587e5e42cda30ff0a5aa09bdd19cf3d453a",
    "support"
   ],
   "css/css-text/text-transform/text-transform-capitalize-001.html": [
-   "0dfbfb62415179411512471fa5debeebcd78ff73",
+   "1f41ca4beb876e6b04822e529297cb6fc80bf8f5",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-003.html": [
-   "ab198975187caec63bffa024fc6b05253caf3067",
+   "2ba726bd1391dbc20d5202f19a699ba79fab7b57",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-005.html": [
-   "ccb130eb535e0c1f17aae64e1e710c0766881f62",
+   "4279ca6ce876a2f2b87734775bf22b54b7ac854a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-007.html": [
-   "4d15b280d278461def4f3e2f8f324525f8df1eec",
+   "6d4e5e432fd34d58ca6be7d72a608e13cb6dbb02",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-009.html": [
-   "b835fc7f47eebbcde0348e43fabafee6afff9fb0",
+   "0e2bdd139fe95081306603210e48fcfbd27eb7a7",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-010.html": [
-   "032a10df47d4eeb5d688a286410e8e78be790ee2",
+   "fd6cb377e22139f2eaf3052366d6559759fbc692",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-011.html": [
-   "40b45f24344b2122a927fdedd61a20dbf9f113a6",
+   "eb16d77c77075c2122389a736bc1a1b255b07720",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-014.html": [
-   "73d5fab0fc82a9860b7e8c0d2199b0fa697a4699",
+   "69550cfb7ac3bc0f96d20aaf9477305144ef12a0",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-016.html": [
-   "502b24ea6c958f8bdec3979d34283c469bb54d3e",
+   "ce2a74bf13b6dae11af4edfd1d84887bc07c8d0d",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-018.html": [
-   "7c86116a9b91a5b148d0d47c0b7745d6c45e57ff",
+   "6568a0366c1401cced398a42b28120af2f66c20c",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-020.html": [
-   "fd1426cf36e4aa42b0106bb15d7db46add231f5a",
+   "0b852ba9ec0d903a3c3cc2089e60640d5174b9cf",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-022.html": [
-   "2c77961741bb819006fd786038901287c4955e3b",
+   "aa702810b20681d583300f34e948cc88a5c0538a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-024.html": [
-   "2812951a4698d0f70c06e291aaa227f38ea6df1b",
+   "891228db895a9363560242facc9569b1ecf48c2c",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-026.html": [
-   "ee8903a0da7564dc4db3828671a9ce000fd0b386",
+   "30e654c5766857b5458df9f98e93040298b31c65",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-028.html": [
-   "005e091012d5a757401cd352010de90564fec3a0",
+   "b274012eb9a2cd08b1ffa71128d9d4730420c57c",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-030.html": [
-   "d5e254803ba8f123ef476e96e9319989deea2e6f",
+   "be2a7bb3f40787aa01f7ae1ef777ebe6105a9093",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-031.html": [
@@ -600696,139 +600924,139 @@
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-001.html": [
-   "748bfeaef4ba88340c8a9b6d06f4f1c1cd6530dc",
+   "0174f0c8113ec2815294fd736b9f668930f1e5bd",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-002.html": [
-   "ef6bda6067637a4d6d99b97e60842e3821e76d1d",
+   "77ec3d4f9fe8b483c39edabec7981465e4e20a8e",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-003.html": [
-   "94526baf8d000f243a31fae8d75c44d8ce861628",
+   "a0381452bc906e3adc3eb207dd65ed0179b935ea",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-004.html": [
-   "ef7cc5d9c6a32976ab63fa0a97f78caa36ef8e18",
+   "e22775e1b883b04642e2ed9a954997eaaaf1fa1f",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-005.html": [
-   "d91a3f1fe6989dcf674e711af402a1886c3e77c2",
+   "cc6a04fa7f3fa145fdc6b0dae5f02d0b20352349",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-006.html": [
-   "55704ede654cb3fda2bfa4f338bf23d1fdaaa236",
+   "90388a249f6bf4c3ffd3d75bab4f7a728dfcda41",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-007.html": [
-   "c95830a262c46ab2296423fd69e9e8f78a53a377",
+   "b2014ee971dc0ed60328bd7117a2de74c5283264",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-008.html": [
-   "7ff767daf545aba260d9d8675e8de107d4135045",
+   "991e0e0e4c19f1cbc693010ef3ce6f1996342c9a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-009.html": [
-   "a04047d0dffd7fd9287c6acb4fbd5dbe767d3ac1",
+   "5e513dcd0762f944b5f1006469733e1a075ae6b4",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-010.html": [
-   "bf98e32eda5e682ced7a0ed67a9bc4390c4d65b5",
+   "c214f914871fa21f452834b0c7647f6dad023ba2",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-011.html": [
-   "ba6fdf141173ff2cc5aad605c279acb047773eed",
+   "4d71b28d6060e5f054e6040cc28e8b10e3e9c7cd",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-012.html": [
-   "e63e319a47f28135fd5b0ee7c60021a3ad7b1b8b",
+   "210551a07dbfdd201f13df2c844b58a2adf9865c",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-014.html": [
-   "cca58f057975e84ff08cb3e45ab4b56bd3b365b4",
+   "0fbe5e97b030335bb6f85c82220f290e4902d878",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-015.html": [
-   "293056303dccddb1659b2c0f9fcd490c0a0eee42",
+   "65071771df20587f50b0dc2288de914c96eae67e",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-016.html": [
-   "3a793c7dd8802ac70aeb4b3f8b5c353bffc9c920",
+   "617e632ab0adae09438b93bc6c8768869cd31d20",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-017.html": [
-   "32a0e725f9eafe1476bf68669cffcf6edf58266d",
+   "a4757edde2dd13854d736d1ed977789bf4f6181f",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-018.html": [
-   "dcb1fac16aed3c3b8953f3d3bf61a6c3f90cdada",
+   "ea636e2edae880364ad525f9b36068ea6fde2f65",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-019.html": [
-   "d43abbf18a8408fd3cd7ea9eb043d3749bfafeb2",
+   "1e945a3307622cd307e38998c37ea209828c4ca6",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-020.html": [
-   "b97f25eaf997ccc386fb13c878e43d762a7edc00",
+   "8487e688b8146aac7596f862b03a68491170dc5d",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-021.html": [
-   "fdb3c3d43985e0075c535bf66d9db08aacb6baa2",
+   "ce5125540cfea9252e82665f2e18a36c00487064",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-022.html": [
-   "cb06c4bd4d598f51e1a233297c8f06c81bd0e1b9",
+   "cdfd7068a38ab91903cec155c3a383f13e5af2ad",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-023.html": [
-   "9b1af86b7e670d420bc93c3f17ed720f283afff4",
+   "f79980f39b68289c353680f5fb662a345d290b7a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-024.html": [
-   "a8fe5f4af0408feeb3e59e6d4d3f2547c116d627",
+   "0511872c7e1150c8fe27ad256639ae0b73473182",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-025.html": [
-   "0e9ec6604c351d9a889492e64f7ea635394bf52b",
+   "ce906c08fd6d54936f0ebba97fcef3ed891eb18a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-026.html": [
-   "f7beb60f044aff46348e990421d0b1b9caadf96e",
+   "7694acb7a63c4477472ea1d5d0e49aeb49c6594a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-027.html": [
-   "8bc19ee516169590e961781502dfd8173a0f40cf",
+   "3f892c502b4cc690b08d7775d976a4e70b35b7de",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-028.html": [
-   "b3011f5352729f73db8a607a4ebf03fc37e999f8",
+   "41b7711b264fb3a58906a399d58d2d79a292ca8d",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-029.html": [
-   "504b64caa99fe7375fe376a1ca70e31065692c3e",
+   "a18a0c651c3a3b748a79d5aadf7f509c82c4fc39",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-030.html": [
-   "745228e110c2a6d6583dd9be6ddf60623af81967",
+   "635ad682947a725e9243d6bb9b63e5970d0479c9",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-031.html": [
-   "ace5e329e9e3cd522cdfbf0b31b500f5f02ba5e1",
+   "916e978bc24a6c1fe53b823b0a7f00dcde9eef52",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-032.html": [
-   "37130efe7b4d5086f428a6fadcb9d01b64f6f08d",
+   "df784b0655cefd78a5e9c067e22652f7227c52b1",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-033.html": [
-   "9525db2e1f2c27cfe52796d1a3095ee26e6f3f25",
+   "fb2973e6556fbcf9ce3b6fda0bfdba391a8f4d14",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-034.html": [
-   "5751ad5a16dc79e2b8c4a78fed7c2de53867c0f7",
+   "dc32f3b4c9c70dd78f9044353ff7d3be64e16b8d",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-035.html": [
-   "0b3398c7c1fe35bde0c867262dc2381c3f85eea1",
+   "f436582d1d43f12c23ebd75768628595a05b7957",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-038.html": [
@@ -600836,43 +601064,43 @@
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-039.html": [
-   "470a4f6fb549f29d9a29f43b68df63b304c851e2",
+   "005d5cb3144e1c4a1a3f59c4add2c83e627b8769",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-040.html": [
-   "0528c78f9d9f41aa061fbad141ee5bfae3d2f655",
+   "c458b53eb3e10328c5bf9108b9f020aa87bd83cb",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-041.html": [
-   "30708b64ff98bae57a9e0a0c39e12c3c3b6fb974",
+   "b6e304772422cbd0ab100459340f7158725a8fc7",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-042.html": [
-   "ffe602f59454c6bdea95dad85aeecf350508e401",
+   "15a777d78db9b758937f76938f2f0dfe52a8fe1b",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-043.html": [
-   "d56f6b3ee3bf1cd0d692d36a782c0040129b31a4",
+   "cc943e56691b28186247b71f3147f37d934013d5",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-044.html": [
-   "6d81c4540a132fc5db5a8361154c3f04f1087f32",
+   "43e678c24b4ac188620b441d1f2e7abee4e58c7f",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-101.html": [
-   "e4f2ca7d9f510359541f974e4f648c89de6e1561",
+   "1b527467a3dc2f07a69a9409ce82c399e0e912bd",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-102.html": [
-   "2eae842e2a84a701a4721b6e2ce62e6de351c969",
+   "8c790bcf65cd87ccfff18452c150fe7a384a0e4b",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-103.html": [
-   "07ceb60c3d8f0578a2b18ca8db825e28a1df4977",
+   "500c877f27d2d73bd0c911e4cf81cc642fd4692a",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-upperlower-104.html": [
-   "9d6b2c2bc7d0cde02d992f741884bf702c0398a4",
+   "57a7460058582f6cbaaa0cad620b460ad18a4bb0",
    "reftest"
   ],
   "css/css-text/white-space/append-whitespace-only-node-crash-001.html": [
@@ -602419,8 +602647,12 @@
    "662f35112f6f1e2087587498f4e830d13686cf27",
    "support"
   ],
-  "css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html": [
-   "268536c98e066b3b6cf9db6fbf67e944c86dbe44",
+  "css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html": [
+   "e2776669f633e055b7193828531728f1570969b2",
+   "support"
+  ],
+  "css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html": [
+   "c9384aace984d0f08ef9b91f002a42de38baf86c",
    "support"
   ],
   "css/css-text/word-break/reference/word-break-break-all-inline-007-ref.html": [
@@ -602688,7 +602920,7 @@
    "reftest"
   ],
   "css/css-text/word-break/word-break-break-all-inline-006.html": [
-   "9f9a618ebfed4e1b747199d36741f5e567b3ceb0",
+   "caf25d942953b5b55fbb0f1712bdd9c0b60a922f",
    "reftest"
   ],
   "css/css-text/word-break/word-break-break-all-inline-007.html": [
@@ -621123,6 +621355,14 @@
    "d5153cf2679fa9eb0de6bfcb2eb30afaddd81fa9",
    "testharness"
   ],
+  "css/cssom/cssimportrule-parent.html": [
+   "2792af69c0c7352812624cda9b4a6aa282d5aec8",
+   "testharness"
+  ],
+  "css/cssom/cssimportrule-sheet-identity.html": [
+   "3db5634ebe5fb00052c699dc02c54786fdba80d6",
+   "testharness"
+  ],
   "css/cssom/cssimportrule.html": [
    "1d7b18f62857dc209c77bfa4aab43e95571298d6",
    "testharness"
@@ -621531,6 +621771,10 @@
    "9945ef47114c2841a746c99a2fb1e93e050aac8b",
    "support"
   ],
+  "css/cssom/support/import-rule.css": [
+   "5edcef7e6914cb0aabb81fb5395267ae4810b76a",
+   "support"
+  ],
   "css/cssom/support/malformed-http-response.asis": [
    "bc3c68d46d530f318e5d6e9140a24519724cf233",
    "support"
@@ -647647,12 +647891,8 @@
    "5e99bb522f194e67b78bda958359f8ace011a59c",
    "testharness"
   ],
-  "html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html": [
-   "2b3f512e381b07fdffac02013b6aea9167d97bd5",
-   "testharness"
-  ],
   "html/browsers/windows/document-access/document_access_parent_access.tentative.html": [
-   "9a06d1beb4a067445296f90bb7913c692f464a7d",
+   "07b27a5c4aeb41376db692e96c47156e67e0bead",
    "testharness"
   ],
   "html/browsers/windows/document-access/resources/child.html": [
@@ -653816,7 +654056,7 @@
    "testharness"
   ],
   "html/interaction/focus/the-autofocus-attribute/update-the-rendering.html": [
-   "dcee4c16a07d9f5c622e562b7807e5788102fa13",
+   "279f70d4903c31a0a0fbcfbf80f3d41f54da9c83",
    "testharness"
   ],
   "html/obsolete/META.yml": [
@@ -665451,6 +665691,54 @@
    "8d0f5d9f4204384ec9612ddca3ec30cec017d14e",
    "support"
   ],
+  "import-maps/common/README.md": [
+   "cda42d06099f16f13e61e30394c230cbbb34f8c9",
+   "support"
+  ],
+  "import-maps/common/resolving.tentative.html": [
+   "c947232e06322addc60a08004c1f21d317647042",
+   "testharness"
+  ],
+  "import-maps/common/resources/common-test-helper.js": [
+   "002c4b51fd06a6db7c07344a3267ae72aac8399e",
+   "support"
+  ],
+  "import-maps/common/resources/data-base-url.json": [
+   "81fcf087425c70eefa7d3c3465be59684fb1a521",
+   "support"
+  ],
+  "import-maps/common/resources/empty-import-map.json": [
+   "ce6c185498fa38c5e2fcd4e7ba36503778ad0ba7",
+   "support"
+  ],
+  "import-maps/common/resources/overlapping-entries.json": [
+   "21354025451cf0c5bba5ff31f36f957189237513",
+   "support"
+  ],
+  "import-maps/common/resources/packages-via-trailing-slashes.json": [
+   "6b8f0135f50f50cd2691b5d4ee801d9671a3a2f9",
+   "support"
+  ],
+  "import-maps/common/resources/scopes-exact-vs-prefix.json": [
+   "3d9d50349f0d644264ed257eb84854677c55fda6",
+   "support"
+  ],
+  "import-maps/common/resources/scopes.json": [
+   "c266e4c6c1d7d9d75efbb0f252e873160d18b0f8",
+   "support"
+  ],
+  "import-maps/common/resources/tricky-specifiers.json": [
+   "d9c80c9475000587643f52d500c0c4d588640f4a",
+   "support"
+  ],
+  "import-maps/common/resources/url-specifiers.json": [
+   "aff55c4d9dda05eb344af83640aaacd18fdc15dc",
+   "support"
+  ],
+  "import-maps/common/tools/format_json.py": [
+   "2808a37906e0f2191a246ccbf1396a92fc1dd442",
+   "support"
+  ],
   "import-maps/core/bare.sub.tentative.html": [
    "7fb769e09a2af432517522f91a2a101efc484ad8",
    "testharness"
@@ -665539,14 +665827,6 @@
    "dd547f01d1dfb2379f6afa893385fadc8f1217d1",
    "testharness"
   ],
-  "import-maps/imported/resolving-scopes.tentative.html": [
-   "4985249f4e2951965ad78321208ee08eca8617fa",
-   "testharness"
-  ],
-  "import-maps/imported/resolving.tentative.html": [
-   "339026259b0f0b8286bc68ddf6976dac0009418b",
-   "testharness"
-  ],
   "import-maps/imported/resources/helpers/parsing.js": [
    "daad6d26d220bb0241f8a413816bd100f3af580d",
    "support"
@@ -665567,14 +665847,6 @@
    "7ac24bf867b06a6393fbd1ef8e9478d28b2d714d",
    "support"
   ],
-  "import-maps/imported/resources/resolving-scopes.js": [
-   "d133b50bd2b8d80ae6b08531e9ff8607e8ed16f6",
-   "support"
-  ],
-  "import-maps/imported/resources/resolving.js": [
-   "ef8a4f87d25e7fc6f11c3ee7ed6ef64497058d97",
-   "support"
-  ],
   "import-maps/resources/empty.js": [
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
@@ -665959,6 +666231,10 @@
    "3e43b63af9545f2828efd2f7ce510bbc9a87bbfc",
    "support"
   ],
+  "infrastructure/metadata/infrastructure/testdriver/set_permission.html.ini": [
+   "9a250edf1a918bc53b41ef9fee429478a9587e1e",
+   "support"
+  ],
   "infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini": [
    "88c9bbd479951b62ffa83d900a62f7a6a019dd37",
    "support"
@@ -666215,6 +666491,10 @@
    "2170347c9729564f7e492009b3d20b3267422c1d",
    "testharness"
   ],
+  "infrastructure/testdriver/set_permission.html": [
+   "1e92a26398d3215646e4d4d152549510abea1cdc",
+   "testharness"
+  ],
   "infrastructure/testdriver/virtual_authenticator.html": [
    "339e42665c720cd212419a956936daf10640d8af",
    "testharness"
@@ -667616,7 +667896,7 @@
    "testharness"
   ],
   "lint.whitelist": [
-   "4f2ef9c005b6a170f7b980617debe5d1293895fe",
+   "a1b3f63650cb91393439224b3def6daf4c3775aa",
    "support"
   ],
   "loading/lazyload/common.js": [
@@ -667703,6 +667983,10 @@
    "dafce7ea3bb2f3d7f4691bc6ca8bde439246abe2",
    "testharness"
   ],
+  "longtask-timing/containerTypes.html": [
+   "94daab793c67f49ef858d2bbad56d2be43b38c2a",
+   "testharness"
+  ],
   "longtask-timing/idlharness.window.js": [
    "fd9a3f042f6c9fc3ac605fc0dd4e23edfa5d683b",
    "testharness"
@@ -667712,35 +667996,35 @@
    "testharness"
   ],
   "longtask-timing/longtask-attributes.html": [
-   "b5d44b0db5d33ee44abf2690b27a233088491ab8",
+   "8e0da824a873c6cf914cc85684d8bceb76a85153",
    "testharness"
   ],
   "longtask-timing/longtask-in-childiframe-crossorigin.html": [
-   "aaabce5d79da192b2319d8ab4baa2c7056185373",
+   "149cf93e8695ef1e65d1db7a3700edfca3710d7c",
    "testharness"
   ],
   "longtask-timing/longtask-in-childiframe.html": [
-   "34b802cb69676e16648879a46178fb472e8f5d42",
+   "432ead57597fd4d995f8ace6f232823908ece881",
    "testharness"
   ],
   "longtask-timing/longtask-in-externalscript.html": [
-   "076f0f2291400aaa0a2c0608f204844b7b13a1f4",
+   "57c2d5650c05e33ca4eaefa95a367dcb44075a13",
    "testharness"
   ],
   "longtask-timing/longtask-in-parentiframe.html": [
-   "778edc1000ffce314c064d2f2bc83e2e2a2b33f6",
+   "2da635467a211cae6e15352c8e9ddf450ce36663",
    "testharness"
   ],
   "longtask-timing/longtask-in-raf.html": [
-   "2d30ac36b96339238d18f596379b0784d9dcd79f",
+   "88ad2ef98927aa64a610a8573e8564c5dce20cbf",
    "testharness"
   ],
   "longtask-timing/longtask-in-sibling-iframe-crossorigin.html": [
-   "b73112e3abf8c88567964690c18e797f10d15ad2",
+   "653556333a14c244bb079d4235fea2cb9a821d54",
    "testharness"
   ],
   "longtask-timing/longtask-in-sibling-iframe.html": [
-   "16f0998c2234f39257694817436b6e6178632433",
+   "280d387654b8a49b7c726db9175983d88b2ce73a",
    "testharness"
   ],
   "longtask-timing/longtask-tojson.html": [
@@ -667756,7 +668040,7 @@
    "support"
   ],
   "longtask-timing/resources/subframe-observing-longtask.html": [
-   "b232ecdd47ae5fa3d8e4f91e40ece1ca4a4760b0",
+   "125ff1e4cb5391eeb8abd7d3ac69c71f912baada",
    "support"
   ],
   "longtask-timing/resources/subframe-with-longtask.html": [
@@ -669116,7 +669400,7 @@
    "support"
   ],
   "media-capabilities/decodingInfo.any.js": [
-   "67b90d9db652817ec0ffa449186293cc1aef661a",
+   "e624f14ff6974b669f80847a2535e6a79f5716cb",
    "testharness"
   ],
   "media-capabilities/decodingInfoEncryptedMedia.http.html": [
@@ -673468,771 +673752,771 @@
    "support"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.copy.html": [
-   "2e3d0c998725bde2b28a08c4f547020f9dd9d1c8",
+   "6cf8779ab0b2a1c822e3ccc1d26ff195c904516f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js": [
-   "89e2328ae935a982d87270e8638d1876edd4fd23",
+   "aa0f39dd2bcbdbf115729f7a245c5b14e9444100",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html": [
-   "aaef24f23ba19ba2c2e9830e815021db9251fe5f",
+   "b086a5429bad0b316c37215508db707aef9e632f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js": [
-   "0b1ac5cca6ae1e5ec43441aa1a22cb1c4e0ba4f1",
+   "18785d75070043f02066638501808344eb68a6e2",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-in.html": [
-   "b9b2d6bde25f99ccb0a63e337b249a5336d1d301",
+   "402f2c3931ad32689a53e43ce32a3b9a6d7b558c",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js": [
-   "45ba1a78293358aa885dd54e04f51b2f264cd918",
+   "a2e403bf77b3763c150b688da73841f8b48f078a",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-out.html": [
-   "3e20486f5791de3571b638e0bd49ab7d8999887d",
+   "bccc50aea397c2daa7e09404b3e2d66167ddf5fc",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js": [
-   "995369115e2b1ff464faf09a9a0bfb98fc22c9ed",
+   "3ae91e39592d596470a3c3e93658f7830bc485ad",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-over.html": [
-   "abf90de0234106ef0e78725ec4543735be33888d",
+   "8128e1108349414a1ece262ea01ae623257aedc3",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js": [
-   "df2d2ba93c14e4bf47ec7a56597b56da34d53faf",
+   "35827d4ea9bdcb4f8300856de777c1ec0e73f051",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.lighter.html": [
-   "bceccf77512abd81ff7c556cad8b3893f947e31f",
+   "20083b575851ad6ca335190b1a5060f790094e98",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js": [
-   "85d813da363b56e21150f906888eb20e726e669d",
+   "474c299d1a245c969761647bb990dddf0db8afd1",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-atop.html": [
-   "04c9d002b5d75cbee974f8ea136fc78b55ec5d54",
+   "16fb9fb3c8747f77a8b1c76905cece22c41dae75",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js": [
-   "97ee55b20fc576226ccfeccbd240b7e319e56788",
+   "689152ae6f4142bc9956949ce4b26734617f8bbf",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-in.html": [
-   "61c96a3e8a2dccaae2ba1841af8cdc785d6fd786",
+   "bf69b2dc0a1b132e85afe3b439d6891a4a857620",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js": [
-   "4699b7815ecc6da4ad61b6e351187db8aa2e26a3",
+   "d68068bd9f5741741987ac70143ff0dc36a5f2e0",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-out.html": [
-   "fe6419237dab6e3f3ced9e4cc16dc06b83e19df2",
+   "21514d32e5ddf7a095ac513dfb80e4b4ea99e31a",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js": [
-   "9e6394d0fc7fe8de002880e9160f0eed07d9741d",
+   "f30bcd163991dfbdb5beb9025da1d44fc335d72a",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-over.html": [
-   "0a049e262b12c69667869c050abe692f3510664a",
+   "54810af7f953663d9b15fdee7b3a06e426f01f68",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js": [
-   "9bde016866d058f45286ecd2a79f6d6e1024f96a",
+   "5a90aedc2c7ea1e8b08c1bb8e91c66a5956b524b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.xor.html": [
-   "0b719cea313749efe84e56eb21c312a134d59fbe",
+   "1c5ada787d458fcefc58f53f9a8750aee87012da",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js": [
-   "d22235d8c57a84d74914e7e536e6e634b5da21c9",
+   "16d1e9be9b0a5a2f25167a9bfcbc1f0c83be448e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.copy.html": [
-   "5c9a8ab52402ad0a2641e81db81e30057259d832",
+   "8f0caa44ead862c1bceeec2947ebb6e0c5fef1df",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.copy.worker.js": [
-   "ed5c04321b7b4313ecd755f8cf743ab774ef822f",
+   "256964a0a6440edfec73d984f5fa7c1b7153d8d3",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-atop.html": [
-   "a709a5f40ae7f7e8f7d4db22a7f67fed4f2d6524",
+   "7b2842d21ec9794083d236577223bb0b7463eb5e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-atop.worker.js": [
-   "0889147f69d42fc15c14f39c76f9fa358778be04",
+   "b40b8f15acd9fa93d098bd878dc7f2981e62c13a",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-in.html": [
-   "d15a40c2734dd0a0f4aee7a12952a66ff43798ff",
+   "6ad4bc4b53fe8c5c3b84d1c3ef3586ae3823d16b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-in.worker.js": [
-   "ae8ba85cd36d671d7a87c5cbcc6184c08c72b1c7",
+   "edc0e987a5518edc88057902af06331ec55d9489",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-out.html": [
-   "e4fc3c8c502aa7cefa3335f2642178a099e4c9fb",
+   "3d3e66ba665a6204d8229b8b6796f31b9a041ad9",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-out.worker.js": [
-   "73632f52776dc91212d6510cdfe7a4383348eaae",
+   "5c6a37a4241e77356541176fb9b9efc2a0ab8540",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-over.html": [
-   "bb344369d6556f74605a6763920d5792a31ef2c6",
+   "f817b38804cbc1ebb901827c66873ef342e527e5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.destination-over.worker.js": [
-   "1c623febc34f6b51d55416992a2f1430ce57428a",
+   "cb13b3d5e24bea785c34d61d4d72555d12171e0b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.lighter.html": [
-   "5f6ed79c5669ede6c234f1b5213aef659474096f",
+   "007966e0c17aa98d2301e2b5b616a566feb20924",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.lighter.worker.js": [
-   "1e04a502ecfbea677b4b0cdbaeca1867b0e9e09d",
+   "840d10f91359b8c12ef7ed3ee5e6d86e11ecc67d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-atop.html": [
-   "80bd52258364c0dbba37fb0bc3271f6863272094",
+   "2b00001e69d302a7598a930520a030ee4ac86263",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-atop.worker.js": [
-   "f42cd0e3b68eee8a21d81f20acc08d6347fd6dc1",
+   "daf5e960b2d0c62acd04a11aa0bddaf469ed16fa",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-in.html": [
-   "ed7e89a79b13d78aa910ea56a44ede59db5eb036",
+   "6809c809f5725698d375d3821c5f09900633dad3",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-in.worker.js": [
-   "b4455821badcdc639ad2380975398b8bfb65d9a8",
+   "81e8ec19eda05a108b52cf54f4ea4effefa470e5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-out.html": [
-   "ff480843f0f1e1565b329fc847c2c115cd9d53b5",
+   "a1c9c3c6b1b5149b31878f045a54486b777a686f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-out.worker.js": [
-   "5d51255ac51e827ffb27e3a0c82fa3eb7368d7bb",
+   "4fbea5c2be2f9f1d33041d402cc6d14bb075333e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-over.html": [
-   "08bce563a927ca2737e70614a8d4b26bbc95f51e",
+   "836806f29a87c34837695dcb7d83c9fb2897c28b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.source-over.worker.js": [
-   "79b67d899175fcc2907868a86ece619e93ec7d41",
+   "cf04b1e38aa50786dd4f036addf0b8fd44fe4a71",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.xor.html": [
-   "6f65ca6f0b84e405535af2da2bb51916cba4c17e",
+   "ca34cce9c04436a75403f4f35834c79464ebb4d8",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.clip.xor.worker.js": [
-   "8c4f98d2bed31a35360728211a4c7f1669fc9c6d",
+   "3bf92d6e13ecb517c2029878355f1f40f4e506d7",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.html": [
-   "f9263c9ffe891a2e6a49767b612afd2e95c98274",
+   "fe982ac3e95938a3348b9b88e29174c807dbf33e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.worker.js": [
-   "0e1b75d179273a58266727bc3cff6b3ce04ad6ae",
+   "d03a459b84378102b7321dc80c88b07e89efa202",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.html": [
-   "e14bdd3975458b01d8e721d0d3edba2b96fe8c03",
+   "ea0b1d9bbb4bc5dea69b9719618450a7a56993bb",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.worker.js": [
-   "6c10209288649d5a862cbf5192fff7fb1fc43dcf",
+   "05c44c7084b92ee969790b1cb3e6adb480055c8d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.html": [
-   "b38efda6cba703969ce21e154fbd1fdbc4e587af",
+   "11b270f412495eddeee5c235a6d6e9f2b35065d8",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.worker.js": [
-   "47229cf99bbe240524f5129fa00eeee9567f8d37",
+   "96b00924983cc2b7b06f6dfd134122a8a24e2ddd",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.default.html": [
-   "d3d9e49269ca0e1961d10b19314b6f392c0b867b",
+   "19739b8783f1d5b488d2eee78c3f0ae30f0a074d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js": [
-   "f68310dc1fb1be68f98782886d744732f387428a",
+   "b1226b8a2fe2e007da2f2602ebde492547edcb17",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.fill.html": [
-   "ad9ffcb4391373bffd3f57fb4829336af4d05a55",
+   "1b7615bef146d72dbca45d2db9f75231111bdfc7",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.fill.worker.js": [
-   "e3d15e755cce0d66b33fe92a4eb774d731fcec5c",
+   "aacc43c44599a49bd1debf01f1051568a7c6e27e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.image.html": [
-   "ad1c1dae6f33b30e51a7fa88a2cc6a0ce49f587f",
+   "2f7a5e684da46c4281d048efdf79d8e9be3bff29",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js": [
-   "a6e2be4522530e52043aa6f7dc188afa6d2fd2e9",
+   "143d2ee3a245322f4faea474426ca08bb67edb1d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html": [
-   "283f5831acdb3ece7e7861594e0e65ab15e04106",
+   "c577b5bf9e9893d24b4a28b8d679f63f67568e2f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js": [
-   "ae0547b5ade6a03490d67d4fb70991a5ee4e2c51",
+   "cc765b4731ec1cbbc940acb8c352d46184b8d2d5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html": [
-   "5ddb6d0caff7f7ef541a035aa112b8d09aa0706b",
+   "02297758c75a260d0d6b103fc9bd97a107980612",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js": [
-   "6bfcabb3742e840d66b9c2444c3b896dc309bffb",
+   "1ab33e9c5bc8fd1376e837e96070425a041ac344",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.range.html": [
-   "957df9b5c1ec5f6aac43aece603371f6f320c332",
+   "8bc440d70366ffbd63fb69f08a1086890b76eb47",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js": [
-   "235fb7bd2aa600e2a3d35bdf9fde0e1b42c02a02",
+   "5038d63da0caecd1e2bc4e9f656800ab35b2d808",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.copy.html": [
-   "370b31601eb710e4f78128fc4006728136af85fc",
+   "322f6cfd0a778a4164b8e7408fe85b47a868ed47",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.copy.worker.js": [
-   "b982ff537aa85170dfb7df171cd2fefa059a8145",
+   "b6f842569074b0591e0586a5cbe8dc8183dba1af",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-atop.html": [
-   "618a279657a0a0fdc708399907c0827d88058a01",
+   "3c54ac26fb5fc9d73c3cef3bed1ab75b99916995",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js": [
-   "e1be28b69bd7a9396263971f3d50df351dcb4702",
+   "48f472bee8c203860d1542016c4b83d08bc0476b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-in.html": [
-   "6f197c961c926e1010a0ea9dc56c98849ddd70db",
+   "1edbcdcf46f47430fbaacf334705bfb805d31476",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js": [
-   "749780e0247a6ef67f8aae02cfbdfb9f3ac14d73",
+   "622b35b7946e4a6ba6a258ad316f045706f8f16d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-out.html": [
-   "c39f8c1e3739dbc1c77d7fbd66eb979aeac87328",
+   "e1d0cbad8ced8db0bd14e393c081ddd5866ea642",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js": [
-   "a68cc6f014f2f3667d202ea923c4eb156fc6d12e",
+   "52c142efc7ee34ca0eadd7366d153e9e632ef5bc",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-over.html": [
-   "41dd506b84421899c347987d4a96ac5711393ab5",
+   "c591a6559f1f10cdbdff55e8f2636c4ee313fb9f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js": [
-   "059b61b53e326b8f5d1c23508687737c4777ee83",
+   "fb200df3ff46ff337d663301da17ddebc857a399",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.lighter.html": [
-   "a9b4aa9e37d5fb7022fdc3794825331e54bc33d5",
+   "4ba8cf7d39ceb507d98d327f14c90eb9c1d5c377",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.lighter.worker.js": [
-   "10d7df9c69601d8d570fa7f14aaa86a3ea64d26d",
+   "212446e51264a04cd08dbb330698922924cc31f9",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-atop.html": [
-   "9ca0ed6f12e5eb0b0326222407ace630044f0d49",
+   "15e057dbe57a0aa9bcf59ef632e71dccbb526902",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js": [
-   "b270ccf4f33ea25dda463f2874a298be490dc0fc",
+   "82ca5794e4600a6d8ba15118d2066dcc770b670e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-in.html": [
-   "7b40b06b239b8f9730c8dd1e6b01d8be2c8ddc8b",
+   "b8190d3662d09f97981ee13d20e31656a334d293",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-in.worker.js": [
-   "de4ed372db44d774e75fad722fc8ded297182926",
+   "9169f57986dafdfc05a05980a029e6b25fb27943",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-out.html": [
-   "690f922b0f89beb3dedd1ba9215bf05facb52c2f",
+   "7a305ba7d8832131a352de4e96ff9859a17a2b21",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-out.worker.js": [
-   "e6316cfc8d2208fed80937ecc8f106df0d32bcfb",
+   "56cc13e6c139f18c2ba27622e25a1cfd0c5fbfbd",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-over.html": [
-   "a384d623fa4b1a52eb43427442388c8102ae0adc",
+   "5a3a67647b45069c7dd508c15ecd0617f85ba0d1",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.source-over.worker.js": [
-   "0ab6fc00a42f731c3acbfbec40a0170723d191f3",
+   "210af01ba54ed87bf74d6947d42bbf523f33c8da",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.xor.html": [
-   "896061f3b8eb38e9d61829b3656dbf8b70530660",
+   "b40cda82e8a3004a10981975f37f3a5dde15a0a5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.image.xor.worker.js": [
-   "717e42e808517dc9d589f3f431d266a53d71af00",
+   "ed6b7df3eee147019ded79188630c7f69f018f8f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.casesensitive.html": [
-   "f0a2eb6b3a70e33bee086ab14f4569c9ced487c3",
+   "41d31287f7163caa42ad914d37f7620d234dd192",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js": [
-   "32014ffe074d702fba632b39c4a7682c9e050317",
+   "fa0b602fddeed92afa6417549a385f10ab8195b7",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.clear.html": [
-   "9c80b14de401834cbc7db5b2c2b60731d86d86a2",
+   "746ab260b590cfd608e2c5f7af246f462db470bb",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.clear.worker.js": [
-   "a5a2c51f6cdb699e64e1537844ce07a4feab0500",
+   "7149fe93af627f87051e4f790a87b755c513737c",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.darker.html": [
-   "572178b0018353cfc211e33c95ef8e8d643fae84",
+   "161611dab9df4ffc5cc4ee61f5a179d1012d64fc",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.darker.worker.js": [
-   "64ee8fc062c3ca8d5f58c9afab493084d712d33d",
+   "6b8e304fd9fa87e40dfd4041ae3a48569a650471",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.default.html": [
-   "6bdf2622fb56314b84a1f3e0a57b2ee8f9670c04",
+   "aadfb5dc61c106438e26d65a5757abe65ad2b7dc",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.default.worker.js": [
-   "768e79b8a27dca18fc205e8f40aa0851127c666a",
+   "2ad80a646b5cd7cd769dfcaa5d430d545c64e7a1",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.get.html": [
-   "ec7c85fdddc4cefe4e9a96e7d1f70a5a736d2e85",
+   "6e7ab55572a98513a124ecf7f3d586ca252cd5b1",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.get.worker.js": [
-   "065ce8593302c15e9c161f8f4fca5db94398be8b",
+   "46cee0b9f1786c466f3c2c45110b50df8332a4c9",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.highlight.html": [
-   "78ca4c87d2d0b6e037afdb23f22ddc520117fd99",
+   "04e324fbfcf996305a3f9671429e8c9d17979371",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js": [
-   "549cfe1fda670108c1de28ad4f9feeea11a52789",
+   "b5417f06dc68507bb3bfacbbcdacacc16f7ee222",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html": [
-   "5fc50ff4003e0078d738ee26bc3ce8e9a9bebb0c",
+   "32a0c667c84a269a862cbb7f3cc60be840acbaaf",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js": [
-   "f3e4d79107fd848b3b7a8d4fd1d5ffdc9f85ae90",
+   "594f42eb9e9941607ae2ac4eded6a1ec7458e5a1",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.over.html": [
-   "2040c8f645c15adc670433a5932b99367f95dec8",
+   "73909f326503031dbc507c54171c5639b57f2532",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.over.worker.js": [
-   "f4cceea613ec685bddfe47c9ce0f526aa82ff8f4",
+   "b3813f2366b46dfcc2c8392f702be58433f46b8f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.unrecognised.html": [
-   "7d736b9d159deb7eebb377248c1999e9633d356d",
+   "ab2baf4ec1079c0429386a0329d7283c59a9ad85",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js": [
-   "9b36e731dc474eea7081166322c8014e28ae0b8e",
+   "4e8db415a47072852ec0be262621e9c52c002636",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.copy.html": [
-   "02c34f08d261999e9b1dabdefdb4026055fe7b91",
+   "d7a55e786cd97f7256818d035eb9bacc6d42610c",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.copy.worker.js": [
-   "26f7749bbac555cbc5addfab98610e24968be695",
+   "18149873c70ad32bf59eeb285f3cb8c028d1197d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-atop.html": [
-   "17171240df11bf048ef62c502b44544ee6cc8cf9",
+   "4048e6916010ee9be9042e6a1496fb6c07a2ad11",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-atop.worker.js": [
-   "7ca89e4587810606858c2de0f35dafb94654c9aa",
+   "0de20958710738907161754afba0b4e0e559b7ec",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-in.html": [
-   "182e2b882a7f818d014a58e6d268ff0c6c11a54b",
+   "0741d410e852414992e5032c5e1c23f8f1af0fee",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-in.worker.js": [
-   "086e51ec1935d99a86c3ff235651194e2f632b2c",
+   "0e9d93a2723466e101675793d89d07877494c0aa",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-out.html": [
-   "90aac468cb1084f0e7bdef57605689f1cba4cc63",
+   "7732e44150dd946f80543390a64cec10a74b2b88",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js": [
-   "3ee4417205abc5c10c14737ee46ecdefc54e9c75",
+   "eaecaaaa3e98e34df46eb8b4d8be2deac63ca8e3",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-over.html": [
-   "044142b9ad326a38235af65bcb1e2ac1a6b48e37",
+   "fe38837c3eddfae79b415d9bb15514cc66475d0d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.destination-over.worker.js": [
-   "2a19cf9d933eaaf155d01ea29ea00d84ff50f20b",
+   "ab2b9d703b4e89994cc1ceb9a08029138b6cef43",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.lighter.html": [
-   "5ea174083ff1e8a988de4959328a23914bae8798",
+   "69ac5353848638738b7d00900988dedad09c69ef",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.lighter.worker.js": [
-   "73839b745a22e1fed4f1b0de9236fc8a0fdac2bd",
+   "a81e34004d24e310bb35a8d24da489c7d19ad7c3",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-atop.html": [
-   "734236c993749e497d5ebf208a9e8a15bcf79170",
+   "5923799a7ef06d1c55d03d47a21db689f506dbf2",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-atop.worker.js": [
-   "cf7f9944cf77b3c624c49d9c6f1de21b281a910d",
+   "a335eaecf0299a8b6fc4eebbc94978b6521037dd",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-in.html": [
-   "19d11b2477b48752cdf526709561b2d943eb6d35",
+   "e2f338e4c48a7e0d4f0111b5af774c000a571bb4",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-in.worker.js": [
-   "32e5295f1132c6f666ba6fe21ea5ce8039a43627",
+   "c33628614ba4373d97cb707961e7151ab6c5b4d6",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-out.html": [
-   "a7bb00e17b54352fd246e3ac49b30ac19c8199d5",
+   "bc240c20bd8bc9ba9deffb905dd9377e857fd1c3",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js": [
-   "21d4a1c9e3b03369562c28450f5588d6cbcc1c63",
+   "a57554a4415bde621b3f45d97c130c52a0644b72",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-over.html": [
-   "5b005ba4e842af0168bb0e0eb4f0ca935ef96546",
+   "9e9bc9d1e0953909fb6097bd7e2bf18b5a2ea534",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.source-over.worker.js": [
-   "ea3c26818b136b23156d0bca144337f1e886a67d",
+   "aac5bbed02b850fd3fdd819968b8b9cf6b92d7c7",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.xor.html": [
-   "438fb71767b5425b61eb574b7e17ae545115d0d1",
+   "47df726038fa6302ed0dbe74134aeee374186395",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.solid.xor.worker.js": [
-   "c518948cb9056351f076a8300a565596a1f25cf9",
+   "66df263b9502175db6e8cffc57559cabf46f12a8",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.copy.html": [
-   "b0aacaf2a6b91402a41bd0e58a6053c4c43dedb5",
+   "dd3390ee26686cb2628003d36b14b9e225f9ed4a",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.copy.worker.js": [
-   "5d8643ebca36036f509024feef7c1116e2486ed4",
+   "67627238d34624964b3a408146e6f45dbcfa6f51",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-atop.html": [
-   "f8615d4f1aa4a20d30bf1f3cb7bda2eb504b8f7a",
+   "feb3beb656e509e6b42421b22d16af66003e4b01",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-atop.worker.js": [
-   "df4180453002a4eb12195dff9f1d21cd9f7a7220",
+   "ece0e5cf1958b009b061954326bde9cd4ae67491",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-in.html": [
-   "2b30d98af356667b49f1b4f577e54926b248fe7d",
+   "d094aee3ff4b3cc8037f08171ebf6fada0e401ac",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-in.worker.js": [
-   "0b78e0c24472aa75bc28b95e8fcd57531ec7563d",
+   "67c6b5f8190ebd0471e1ba2dbf5bd20c840b54aa",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-out.html": [
-   "ad90c7b45191844aa4a26b8bb7d026f11838b04b",
+   "176e50dd196c8fa1d08aafbfb083f43bb8bd3fd6",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-out.worker.js": [
-   "a9e240ed0611ec1b8e132a8490178a344446930c",
+   "016c50ef1cbd80bc35403a9d5202d7e66cf009e6",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-over.html": [
-   "8c2107dd660abfb093378b4bd6f81f2a8df8daa3",
+   "6ba5e0cdbbfccb837ee0512d1b0901421d2b2fa5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.destination-over.worker.js": [
-   "a78c609bc985bd6e72cb5f4794864c4fe92a2753",
+   "dda74f8166da1de9f08ae297fdcd24d052cfc476",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.lighter.html": [
-   "361547109b871191b82ec624542d3bfc057d4b5a",
+   "e06fe91b9466db971f8e7e0f8636dfc5fa634e83",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.lighter.worker.js": [
-   "0eb9cfb88a06518264f6421ce226d88ce8875fde",
+   "93eaf1c10db586b4154bfeed9aa548c703134b4b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-atop.html": [
-   "575b8602c78e7bc361fbc0fdb81086b85f6d1f52",
+   "7ce4bf520212e7b3af5f23b9199f94cd287bb052",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-atop.worker.js": [
-   "09fb6a36a0898c3e3316ac6c3ccf20e73f128a80",
+   "6d4fd1ea22bfd20be4431c7c05d056b496c27315",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-in.html": [
-   "1b6f95b0b02ae7fb1774b465bbc0787aad2fd45d",
+   "727f26f4029cbdaab2c3d8283cc8404061f9226f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-in.worker.js": [
-   "770ed073094d639ebe132523d82da6801f430c8d",
+   "ecd8aa5dfbc07cb3340c78a675e36916b86f2980",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-out.html": [
-   "093da537fd354900fed09becc11ab453207d854e",
+   "ed447d7f2d0d92908ab5a86a9be991eb43b3c7ef",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-out.worker.js": [
-   "781d1cdc39abbbf572c1cd16218c70b3828896a0",
+   "243c8b35da8b8b025a43cdf6e0a50f57608c1abd",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-over.html": [
-   "20718ca724dcf542cf54408b2f4a6f1cee38f78e",
+   "bb4b2889eec6c8b9eac2fb4f1563913bd2635ef4",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.source-over.worker.js": [
-   "6c92de447a0df20bfe690f6ae5df021ee14e712a",
+   "ba804b50bf69d05234eddf29b27fea11bad9ded6",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.xor.html": [
-   "63202635954c7e3eaa95519ed2ad15150403921e",
+   "76002336bf3b0213c90dfd91ca63a8e3f941dedb",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.transparent.xor.worker.js": [
-   "a489a98edaf55546e397cbeb422dd00f2847c876",
+   "51f8eb2a5a8d36adf8c4d0a862a79bb58f02c840",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html": [
-   "6c16912f9b1a75310acae5e26507248c54b74c61",
+   "3418dfdf09f1d9b5a57d5d54270f41cd2d7a07c9",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js": [
-   "67875330fdf9a5529663a0e510aaad737c598f1c",
+   "74bb34a19e484a45fde1a187eaf6880b2c032b32",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html": [
-   "464c6ee4a6ca81bf9f4f273985f6f79e902b5bac",
+   "4864995d3c8a4d50111c7daa4323dbfc45e58541",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js": [
-   "ac4d2a4cc3c751d327aaa34cd587e2b1b2bebfed",
+   "55e58c89a72f732fd8bded4827b44e43b98892cc",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html": [
-   "02398436fb6d517f9299b059b63bcfa9b4f3d867",
+   "1cb6d26397e6b03975b8fcbc99571161462ed977",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js": [
-   "ec494169cfb3159352b67ea86e145388abfdb8ba",
+   "b961fd53946c085bfe53df34b371b7e896a3e05d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html": [
-   "5f45113bf57b2f26931de78498c0b797cba75c51",
+   "fd9ecc5c533c12f6d640f0a7f838b085ebd5c2b0",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js": [
-   "37b810f2a18070a9d65c5379a4fed0b3d208aec4",
+   "f6caace54b977994d3a9f26475bcb37d438ac180",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html": [
-   "0f5bb53183ade283f6745985031765e8b2736f04",
+   "578a1a4bd5e05b0e37ae0ec2e935d1f540b935c5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js": [
-   "5d8f45248c26a89bdee17de17d5f17dedffcab9d",
+   "6db1757d1b80117b51e82cbe6dcb8665247b8468",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html": [
-   "a4a095c546dede44bbc1d26ee6c6dd8cb224daec",
+   "ae9196b7afd452be201c6ea794a4f875b7621df7",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js": [
-   "c6cedfeaef30355e2f6eec0ebbfc12a84e32352c",
+   "50f3c8256b739acb4a7e5682dc5a4e4b6d6f7d02",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html": [
-   "3148fad9907be32c7f90324f6c6465afd7aa4239",
+   "a1d9c33c6ed206e9aa131c210095a6af578c1d97",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js": [
-   "9f2717f8623fc8e09494d1b7e71f7fa9aade861a",
+   "93bcd94c63235a3c4424e6ead372051175f3ea5b",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html": [
-   "5363cd5215b10594a98e0eb45ad53ce256e08f40",
+   "2268f93885bdbbe5bee33972ffd357c532484a63",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js": [
-   "72169a005d4c55aafe8957a7c0bd5c96fe52d9ac",
+   "7bf112ca944fa27c9d08f1067304f9b227da7880",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html": [
-   "71650872b981b60b8efdc292f3db6cf4fd7a84e3",
+   "8f544237168bee0b2577561c3fcdcfa6b4b8d757",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js": [
-   "2d500492125e474b95a9fb5e8182564c1b6d8dc3",
+   "600bc2f61595ea43ed3e1df56da621443ff4f33a",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html": [
-   "2b57b98c4c18e26e73d30fefa5bf2cf37c4dc95a",
+   "d15616d6bc4036b0a03085eda3d2209e85700386",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js": [
-   "76cd267ddd3436733b60e403a43037f8adebe3e5",
+   "d027bf3c1178ead59641519555d59150f53c5e8e",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.html": [
-   "1abbe1efb7b5e056d2dc45416a002725788afb08",
+   "d24f6b4dba237ecdffc55008c886bcbb792dac81",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.worker.js": [
-   "aee59d2572e1736e77bf11a8cf28e9629960d264",
+   "b5400201252b48c059e42a68a90e7138cbfe311d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.html": [
-   "46ce0c0ad0c947e64d2c6403ffbc594eb9e33a1a",
+   "22a8bdda7d497d2a97a554216d78ceaf90538403",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js": [
-   "3443c1ada8fa21583b93525f1759c1814f71fc08",
+   "b81303394fbd76b2a3d1e1812289e1595e82ff87",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.html": [
-   "edef4bc0f6236f8bc33650b9dfcc3be3f0f3376a",
+   "97af6731507bb5e0970046f160d9400a74449665",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js": [
-   "fde33a5911af952f018811845e5fcefa01c5000e",
+   "aacd96f55816c92fc5cad75a3365127ddd3ea2fb",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.html": [
-   "3239416ab4c506cdea57f42eab14b545f71bc180",
+   "3904ad54aa0ace8b610a73d9c0fd4a4286dafb00",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.worker.js": [
-   "e591afc06fcddee2655efae1723a89f30631c97d",
+   "cb1070b37e5d12b81de86dbbf1381bb8b7e5bc66",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.html": [
-   "c4e66c0ebef943dc8c7208538951ac7354e68e1a",
+   "70789f486fd96b040d2c22fbf17db432e037cda5",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.worker.js": [
-   "ab4920dc21345a129d937eb38c6cc4a8fc1b81ef",
+   "726c3a80c4997d7876c5e650fa3b17908a63b69c",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html": [
-   "62ad916d7589a3276e9c133b76040ab5dc7eb619",
+   "16d69485653d4df448a023fcc6460c427425ada1",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js": [
-   "d42495e81770b0d184fc7d579acca9bed43dc89e",
+   "5e2d6590fa47ef7ca4a46f928ba03446c26076f2",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html": [
-   "364029d6a401862383292033006a9bebb2f6e869",
+   "9f5b8e8751a9720249de944fe0f2d7ff3819b90f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js": [
-   "76c2fcac8c4f2a2796f6ca02377629ede73d8d62",
+   "7c4fb96a3722a9b9e6234a52920d4d7566caca02",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html": [
-   "b9c4613fa0e7ba6248dd8d09bd671d19b10275db",
+   "6c08dd1ae226b033498c916318cb04918bf298ea",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js": [
-   "476f957fcbf155e32c5fa3a7462b24ea95cd5690",
+   "006268dcf6407a8040b8f5d7e314afea56738c6c",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html": [
-   "fef35beb8a347656df7587bd75f81f471f482d7b",
+   "3cf0ac91c02914a189484adaa7d2ac579cf22a6d",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js": [
-   "522ce49826442fa5d4d859664a606dadff36b65b",
+   "1472e20a2d1fcb0e95dfd14f86f034d092d7d56f",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html": [
-   "2084611137174c0b7863606b775b1714c1570dea",
+   "7b8dd8ac35890fa01531cb616adb328302bef791",
    "testharness"
   ],
   "offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js": [
-   "be212173ee4fa6d2ba82532171aed5ec38f8f176",
+   "c9f71f237804e25903d67e5526faa122b1efbbf1",
    "testharness"
   ],
   "offscreen-canvas/conformance-requirements/2d.coordinatespace.html": [
-   "96387e5a107f3ba39e21c921e38fb44223026419",
+   "01b3ff9c65fd82d3353a75cb66414cafaa70db3f",
    "testharness"
   ],
   "offscreen-canvas/conformance-requirements/2d.coordinatespace.worker.js": [
-   "f4e30956f63f8c7a41e26c5198a872820e145251",
+   "c39a6a4431e9f78a8cc8f9bd82726ad9a7af8e36",
    "testharness"
   ],
   "offscreen-canvas/conformance-requirements/2d.missingargs.html": [
-   "67152573912203b64ceb94e072b869e425439862",
+   "4c810495c8f224d58e8855c0dc6384abd4e02406",
    "testharness"
   ],
   "offscreen-canvas/conformance-requirements/2d.missingargs.worker.js": [
-   "755e881eb06e0380ffe0947c19ddf77d65bf098d",
+   "b8bc127b877c088699c498ac276bdbc423d380ac",
    "testharness"
   ],
   "offscreen-canvas/conformance-requirements/2d.voidreturn.html": [
-   "a90e637d4b2ce8322a89eb3358761126cdb6f4e8",
+   "bd1d5412f6056ae3790ad7ad00773c9bae335977",
    "testharness"
   ],
   "offscreen-canvas/conformance-requirements/2d.voidreturn.worker.js": [
-   "d25b85d3fd3fa412c4805ecb41402941185d15bf",
+   "6283f53ca955f801795ff1f1bb09076074fe7a6a",
    "testharness"
   ],
   "offscreen-canvas/convert-to-blob/offscreencanvas.convert.to.blob.html": [
@@ -674244,2171 +674528,2171 @@
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html": [
-   "97eb5aa17198a4c8b65dd6b094f948c2df1ca527",
+   "44f33cf5e2ffe9b61a30d8c0617daadb9308d686",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js": [
-   "cb87cac359c56471be3f3baa12a68c73dc1e472d",
+   "a600e2f28f2cce1f903f13eb8aea221c8e97c512",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html": [
-   "c3f7d89112a90370d994782984b77b6f1065410c",
+   "d82aa2d45d2367dfaf3e68d4a5a0b8b7b85bc254",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js": [
-   "b0e69668043956be8266b7fd538cf016a94f4861",
+   "6fafc4e4f69b69eb83d24c5db899e4dad7660262",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html": [
-   "e4fe9b21ae6337b35fc31014df94197e249500c0",
+   "44da5d5e5bbda3dde5b71d023b3f704a96e92fe0",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js": [
-   "482d06e3668f93166c473f36127c14e89d5ca374",
+   "697449f6dfe6fdfba2c58ee33e871782523fae80",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html": [
-   "6d8594580229cd3b531b4956413cc33b9e0d58a1",
+   "aad38fee72f09f0e4988df0643441747dfc6a51c",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js": [
-   "36141a072778d5f1570dd83bc691d303e3c0eb5a",
+   "19f4bbcb30673856703231c1e5338121151e9520",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html": [
-   "927a5fbef49079588f9bc01e6077d83d51f93b7e",
+   "ce7f835bc8d57e5cc0392a65c0448557da082ccc",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js": [
-   "2d99434b9a1b6a59cc97e93a4967fe3f356b9d46",
+   "3b85461f71f7f0df332929aa569cc2c1b6c196ba",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html": [
-   "c6b9a1f8033606614a7f958ee5fedf96d93d53e9",
+   "c18a47ff34f241f975dab49b5a10ba11020527c0",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js": [
-   "1020daa576c5d77b2f5f9d4f8747caa6c9e596c4",
+   "8525ee99efa916c811c8709b164ac875eb87967d",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html": [
-   "4efd2fc6fe3713245c31ea028d251822c0b5bbef",
+   "4b43d5fb08eedf17783eb5787df588716cb956f7",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js": [
-   "0acde77b9cdb1d3b759ccd3c3784adf990433fb7",
+   "d73e3b952dd14753314b354b224a40dd85b03b71",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html": [
-   "b4054619324f3d177a12f76a3f673951fa098894",
+   "33b2502f65b0898811d4b79e3bff20b603b11723",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js": [
-   "1b3ebbe1831183d919c37bf06ec67662479638df",
+   "5f29c1a1cca110bb9aff7f683aec514e6ec21cbc",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html": [
-   "fdae65644dfe2460a266fb52b7621c93fc7f32e1",
+   "16e9f791b2a8e2b2f95ce15706de853c27a4cc1e",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js": [
-   "17bf662321dccef30e8ecc1adf5a737e89197178",
+   "c3b566e844a7a33a724dc362b632b114e50249e9",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html": [
-   "9193e6db8af5295b50c08e895dbef6bc7a235737",
+   "a64d20e731e80a59fda6845f9a373a630b7903a7",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js": [
-   "f3c847f4e7ab93a5b4916628d455ba70b350a4d5",
+   "63163bd60aaac084413f7daa09018a705236710b",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.html": [
-   "81ba371e54fb5f187412f34482b5b0e331b25224",
+   "2fc8293cb22c49acc0e189578a09856a8f00d248",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js": [
-   "338d8de89920c1c44f60c20ff78a98e8668eeadc",
+   "3ff2dbecd7c958c4d51f8e8d1e3c49de71a74aa5",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html": [
-   "b2f756c5edee7c82a95a96d19ffd21c7b972d92e",
+   "51651e56f390d1174469778811d16f2b1f07f766",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js": [
-   "026ed8de89c9e9b6c2bc0b980e02951074a64f0d",
+   "90d0aad3ff8c61178e2934f7df104e7f1a3a050f",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html": [
-   "09cc0637b0ec8abbd82654f669615fcc02c35091",
+   "ba56e366f5a8f1864ae3555582fb66ab3abbcc48",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js": [
-   "4b882ce36ca05b7b40adeb3f91d73225f4aa4585",
+   "09e3b3a00af164a01b2716e99c6008d32b937f89",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html": [
-   "64748731ad2367ea5370a39b919f88c6c631265f",
+   "49a88fab035f2c68dadabacfb73ff8eac9c44195",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js": [
-   "0f95f51005962110cc64f3fa06c190a6f4b15302",
+   "45398e83191593eb07af4481eeb2f70a1da14ecf",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html": [
-   "6b5d6fa52c8edf34cab00398ed3b3b44dd80bf8e",
+   "9466738bcf5c221bf13b099b635fe1f634ad8c7d",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js": [
-   "8ba67e3a4665f07dc6cbb909d51107dad488c7e6",
+   "284b45840677af97a04f2211dc485893d5776cc2",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html": [
-   "fb4c3ae158b99be1d7448067aa0b5fa93092e1b8",
+   "4cbd37445c18f2deee6cc46950400f2f2765b87f",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js": [
-   "2647ada247cafcba853c7b03cc023808b2dfb1b9",
+   "00f0e7ec0661659ace3d69f7be306d86ffb4d6f6",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html": [
-   "b5d719a31b4d38d4250a48259644471a2356950c",
+   "66e9c2122312e6427746dcb27f235d8e191a078d",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js": [
-   "8d933484b5d2c44fa62b9b11086ca6f5b5ffed5e",
+   "0f24542d928568e45161cf128f43dab84c8b88ec",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html": [
-   "e98657092a94d7ea2d8dd933b0738be9732906bb",
+   "9ca1a884b609bd2b745a1f1d39ec9db4225b3a89",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js": [
-   "1d2f114f0f7ba8f35642b27dae37814af2b25357",
+   "f5d26785800a268867df360b90686fd1f9084dde",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html": [
-   "515d0de7a11e6de75adcf9d599854acd4470084d",
+   "4d71c21bfb92adfd75a825df872be24d9ee9c5fa",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js": [
-   "c31c1fa00f31e9ade57f315b47c01bad8170acf5",
+   "6f6b1e93a393064a7991a80d9e29211b6473144b",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.html": [
-   "8e7ad974d6ed60a2306a567027199735acba0b7e",
+   "0cf9ca26d73147f38c3d4538b82a33d0f6eb11e2",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.worker.js": [
-   "51297ebc2173916eb541f008c2520c4b86561308",
+   "8ed0887ecd879783bd18e3eb82215a48f8db2285",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html": [
-   "cf6594c62f83194ffef48e8a4ff7d0099e648bb4",
+   "47763cdb434466c3b28dfa87249e0ff4d746810c",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js": [
-   "12c2ecfac0cadbb24f8b64f2e9dbcefc64d8039f",
+   "ba8302b5e1e8a0d97c970a41619644cb942e00e0",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.html": [
-   "e410e30cafdd62ca917d0fcb93a9f58b33e4d8dc",
+   "de4a0f7eb59d8dae788c210cd64a075dd9f1d08f",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js": [
-   "171fededb81a639e48956ce19478170c778ec776",
+   "5ad9048caafab18af5f8780999646cfec2418aa8",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.html": [
-   "55861656d890b2846cabfa3bcbdf2e4ff66d7023",
+   "b2e58db57155ae9609437be74ae2abf11acb7518",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js": [
-   "5711bb7e4ba3bf273634f539c4c58c8ea791aa70",
+   "c6fe0dcd2a877d052bb3ba82a6ddf3f9fe8c71de",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html": [
-   "bd8146d3f2c45abe35c6c2c18c2778da2be11c37",
+   "ff83aa0330f7f37934833712f5055649c2d162df",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js": [
-   "7ff73bfb927a2759d9852c2061338619d8408cee",
+   "382190e6cd31c4122b825424468a84b510903e57",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html": [
-   "2c1ca6bdf2bae7fbdcc70dbc504319634b6c6382",
+   "2adcf02142233de19404eef6e2a965b7b07c5e8e",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js": [
-   "1ef01a88d3e1b3e124be3a1d1aab9d884f738add",
+   "5e1095bc74efbfddfd7fe8cc00cb244cf5721182",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html": [
-   "1a7dd432216586ae14e109804729c1005e9db686",
+   "5cb283466bd5879d7084c3b52e23a2517fe3f6a2",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js": [
-   "a8b170c3b4412876d3d23619c85e9fc1df70c63f",
+   "ffdc25021635a8264bc7c371a7f3e5e3c1236536",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html": [
-   "12bf837407fe981136da8723bfcd6fe3f2a3b7e5",
+   "f945cedab15fb77dc2a714d75d407587636c8058",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js": [
-   "8d18929a0d7f9287a5a7009cf96ccc46f6fbfe17",
+   "1e9d63cf92b0353c88426cf4cd68e5a507333435",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html": [
-   "137d663aa32a65e805b20815101039d899b408c3",
+   "645e2c9711f5ea2448b237abc271571a9adc2d50",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html": [
-   "28ded3ad3b4c4f1ac144b1997361341318c7d847",
+   "a38e98208b7b5b5df0c46acafacbad4d512d4fd8",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js": [
-   "5c76d552165dcfa14fe29171350e54a6cd925b37",
+   "304acdc11732c3ee9c106587dcbf41fb7d270c68",
    "testharness"
   ],
   "offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js": [
-   "90baefbe1175c6152505d53e74e34ac4e90def3c",
+   "1e6f54f3882d40419c7f7d27c95f9b4c871e2c06",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html": [
-   "e92ac62e80bbbd8123684fe3e1a22d569cfe1235",
+   "b795068185861002a50bc3a79e884ad96947abbc",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js": [
-   "a456ebb05976a6a487bd7f7b7a7e25d36b32d7c2",
+   "7871a0395034c5faa5a66f4033b59a31407111a6",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html": [
-   "653d3918404e7928101bf9ac968d0eca499348b9",
+   "2c3ff0df91b3bfe162fa1dc7c9bd2e661261ccc2",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js": [
-   "7d03f40ebf06b66ce11b9adb70ca332b8979f36b",
+   "456aaf46046e66b3437aab972fbdbc4eee265d5c",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html": [
-   "f5202c715591f9171975ac6b7640784723d1ded1",
+   "9a289c9d6dbd7f9c7ad5e6c218e0b2d79349e896",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js": [
-   "6593928b6c028286efbb89019c5d7f9a72be51a4",
+   "7feb19a9a3f2609040dd4a74c0129076e90cdc7f",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html": [
-   "803df81b73997978a786c4f53a08fcd3370f9d97",
+   "7cb534c0ec9b27c56f8b80403982addb2a157f5d",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js": [
-   "efe5d2e499355ce283cc9c1b1fb6984b15fa3b72",
+   "56c46d4b2aac47697afce02574d9cef17089a2c4",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html": [
-   "ff69557f9768d576645928d321e19f9ac4fbf324",
+   "55eef3d9b9a02f8bee49f05097d75733f9d46049",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js": [
-   "ee6ba9ec6d6a3f617b9adb14368800959dc74bc4",
+   "175634fc71a2ddaa0942633d59ce0395f45f9872",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html": [
-   "ac94d019abb50a5da0011703bc9168e4949b8065",
+   "1b236678a70d330ac881bdca9b7cf53108a8776b",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js": [
-   "aae7f12d2bd3130fb278b72137951b7732e80dee",
+   "a68e54ffd1dbda70064b05468022ce31b5387fef",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.html": [
-   "0b32f318c6d6061037e021e760c40ef15d556a1f",
+   "17f200a5d693bb5e15e457ea424971f0906f8309",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js": [
-   "2716cf0e2801c8b48bc383f7ceb55fc530925266",
+   "466169a5eb3f62f239aee7ef6a0608fd5269dd99",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html": [
-   "5361f4ebd179d4cea9fa9baa5efea82f71e71f2f",
+   "a8bc47dbd396f713677a7d1eea2c0ff3048eace1",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js": [
-   "5b6c634f5ed93605a2c8088ea2b02ea6db3190e7",
+   "2f06e81af26e690294eae5fe7c0ff424f3d3a8b2",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html": [
-   "fad0e223f8795d0cd0a1f621ccfff54c5f118da6",
+   "a32a7b127e0da8c8d3d83edcf49a548ff50d3e0a",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js": [
-   "73370d1816b6cb0308bbef75a97b36626a60b10a",
+   "6da0d2ab1ba516942823ae7d7741603d1ee14c22",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html": [
-   "ab0fe73c5280cb7dcb9004861194a6c1f99f0384",
+   "c068a7a6b5bc38d1edac676a43010538deb03333",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js": [
-   "0798b27118fc74f358a31ba08c1881c48111638f",
+   "332cce2bf987738efde8103bec04607b04e46e2c",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html": [
-   "12ae629451d8d30d9150a152c6a18734ffb0377a",
+   "92aa877853f8671ea7767a003d77467108cb4fc9",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js": [
-   "ae7cc6bb0896ba2e31091cb5bdb0d52547504063",
+   "17eed3a873db889f0a8520a8e3883ae778f15e01",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html": [
-   "22bbaab8ebf262d8ad0b311a849dbf3f9ded7ea3",
+   "a7a162e392ffa094ae0f3e717fe0ff43b555797d",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js": [
-   "c2128b1d26626ec4fb8044ad78798bd5c9ae2996",
+   "1125a7417e25027e286b48b7e811851ee3d243e5",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html": [
-   "e64eabc80387aa307d66631da8032fccb526cb09",
+   "433348716d4ea52bf7f1de9d1be6af0298ff946f",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js": [
-   "af040f18e1f1d809572e03e60b5b1aec67034b6c",
+   "08de0e8fdc6c847b5ba2d70cc5b09401948977ca",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html": [
-   "13cfb518de385955dfdc3409330bb4a970520ec1",
+   "4d72d88e0b73dfc06bb676834187fcff2b025b33",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js": [
-   "d12689bc7ef5a5ab004154031d6bbd1322b31dd1",
+   "e7fb7f70ed54774896372a9f425b2b6cb0331d84",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.html": [
-   "5f454b467ab580b5268d4b71203024c809f53918",
+   "e4235dccfc4ca2d077d1df8297f22b50dd021924",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js": [
-   "9fb2852b574594871db0d2eea375df074baf8bdc",
+   "1f0472eb8983e96d443d0d0b9b71d1677531e118",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html": [
-   "b9a643580ae200755517745605aa2deb8a7de83a",
+   "744b53581ca1d58364b17f1ce1b8444e97668ecd",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js": [
-   "bd660b507177c31db38371952b58a20caaefe681",
+   "f31a4166625f69c0045a03e56d19932e5fb55be9",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html": [
-   "4ed1b28f62db31e2f377ce78ad6159e2891f2342",
+   "a4652b503dc62892beb2fda8974bf895397b377d",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js": [
-   "a204b90f3f5fe607e5f7dc15fbf66331c2d500cb",
+   "a61a563391775853668e1c074e54de62ae88a22b",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html": [
-   "8bd26d205604b7a983cdd978e6e51cdb8e2fce03",
+   "8b69c5c2717da3717c7a87d38e8630ea06370e48",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js": [
-   "bef6fdb6251305076980df19bd3701eeac02c408",
+   "6a537d8d62bdde8481985c7a4f4871bf460222b8",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html": [
-   "3a8c38a20054b79a3e5c5d8a1faa8071e7965e7f",
+   "116cb2419d71031a7512fbe1006b87ac4306e227",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js": [
-   "225788b081a7c183c5bc4c291a6d6ba9c41a8ddb",
+   "ea9613ae61b6b4b3b45d075cf3e0435e1aeaf236",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html": [
-   "6ad1f1eeac0fe39158dba35f4f3dbc58cf936407",
+   "1832d6d890ac2ed02882d25022d29ee5c315ba7f",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js": [
-   "33aad46741a0283ef1966d3715902049db1c8a3c",
+   "7b76210d7fc73ce0678cc81a7a61c91b0be77ffb",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html": [
-   "40cbbfcf550793e6dfffe931350a5546fcf7f191",
+   "563897f368f6b5bacf1b640f2b4a744e7d0e2ab5",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js": [
-   "cb95672e38f5d255c41a5d0c48327d6fae95fef2",
+   "7c81bcc81aae25797ea06635284c78b362c64e09",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html": [
-   "dae7c9dcdb94b7f211861dbdbe23c0a83535e887",
+   "5d344e88573805a892edab0c9ef2fedc374a4ddb",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js": [
-   "662f3dd68654fd7bb5fcd18a4b6691ad7340f81c",
+   "d6e64814e98a9f5a9a863735b7a54f6b10698645",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html": [
-   "a05ef50cf25a79881a62c01db9102d7dae176034",
+   "fc7240e8a0c18172ea0e00e65cdf3111223de62d",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js": [
-   "af12c4a0751849e78ced3686d53c45ec79b629c7",
+   "7cbccc4c01d08a79c8044c0c34afb7652b27cb66",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html": [
-   "db26a95e6e20eb7aadfa3dfd4fab082332e88add",
+   "621d7b698be255db083c45ad17f367da16ee73e1",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js": [
-   "3b622121fe26de64526a6a61c405b08940ea56c5",
+   "bcd0deb2487a1693314b47ff1b11758ba907b573",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html": [
-   "79c3f79f2fa27f5335c5a9a176c5f281c867472f",
+   "87fbc44d88b054b52a31c64f68da4669bf6bb8bd",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js": [
-   "3819965fa9ad6aab4b658cb8b6fb6804e5780c61",
+   "8d5bbb059ad6a39e1941a3aa863d630f9c6b1112",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html": [
-   "d02d046c4625b51d5b28988e0e5f66bae3952330",
+   "c150f5fac1a8c7a474b350f8438360e6b5b73701",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js": [
-   "b63ff64cc41d3b5c38bd04373f01fd5f83674e31",
+   "9e91e9742527255c863c32b82160a966e2284e64",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html": [
-   "875969ad03412aa5d587f0baea7d2dc6e3957882",
+   "2c90129b3953a8f2d5e3b7df921438eaea1b1390",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js": [
-   "90b6f5040441958259f82fb0dd9ed89d918e8a0e",
+   "89275e809ee543cfd1b1072e70a3445594e0c5a8",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html": [
-   "2c2cf39b1496f2c0eb859b289412240d27c40a36",
+   "12482af4c50dcd0076fb43b7ee509a26e6dd185e",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js": [
-   "3f2af8c0ffa1efb6ab3230b8d578a08f6335085a",
+   "ffedbe5bd365a9c45d7034fa8639272039a3bdb2",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html": [
-   "cebabdb4f126c8a9690bd2ed85c3c38270b8aeb1",
+   "ef4388f09948a30df28f0dae3582ea2e6558f6bf",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js": [
-   "9b5f26ed925a733aa93dabfdee67d7ed75a47fdb",
+   "de6cfee74f6cd5cbbf5edabbda39df5f1582221c",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html": [
-   "6063b14c6b6e77b4fe0b2781c6a6f3363ef279c4",
+   "80429284e99cb56c89a415127112c029f87aab8e",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js": [
-   "aff8dabe7dce8f31b7c273d608d13d46dde2c20c",
+   "c4ba24f1b04cddcff15c3e56b8b7057e1b87a095",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html": [
-   "5f169c6e957ec6458e7af5e6b8c83de9dd59090d",
+   "860fe32dd7b17b0d5ca322c1eb90bbd0378cf2c2",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js": [
-   "a38d6b8cd9864365c4e54009b2a43027ce13041f",
+   "31f06613d1d30c68185a47e3fda5d3b7337cd3fd",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html": [
-   "7588fad436e80d4f205a381e4bc0430ff3dba205",
+   "5005367b1a4cd926bfeeb0cf159ba0a404cfbabe",
    "testharness"
   ],
   "offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js": [
-   "f2ed55227d8885bfb631e70ac329d6f503959e7e",
+   "155663bc1cae4f9f4ba1e02ce06abb02dd90030c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html": [
-   "51cc739b99ca61c82d8fc752125025366879ff3b",
+   "adc4818b644b2690865c3a4c92d5c15f3a4f5c14",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js": [
-   "35f59e21eef663dc9926fb2fd5091ded4030d4e4",
+   "99563f79eb80bb1859d534623cb054d8eacc380b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html": [
-   "56be1ecc1da993f8b67c1513a77bda28d1162907",
+   "e394f8550922268815c01da36814e2d67860a89e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js": [
-   "40aacb1d42889d2a53e4ed96dd8690dff25ff02d",
+   "7fa157d19c8726a2382122ed0aa3b20a28230af7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html": [
-   "719ce0ca7f1993529430188db99305cc735fbf1f",
+   "3cba3a4eb885bdeefbc06b96b149a16d7e9551a6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js": [
-   "157b41ed8976c4f09e59c25456ea76d407810275",
+   "7fa7fd5ae9d5b05f89f224e2c31979b92b6a5192",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html": [
-   "0796903fb5bb0f2db2da3f31b49891fd3ccbed28",
+   "fd4c44573ed3715d247e2a65543c909a52acadae",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js": [
-   "0fc8220366782dd8c56e8b0b4a84b81922b8cbe5",
+   "8bb175a0be7ab6ee00f68d2b7d9d2f3038bf912e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.html": [
-   "9c72f979b0b3b21cd255c25ea116ad02bb631c2b",
+   "cf2ca4c0579587c8a6c5d98340c677557e4f2626",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js": [
-   "900d6e9371ac1837e8b161274e914b7e31fabe32",
+   "705f8ae697302374605148367765e0c4e1427817",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.html": [
-   "b1551cdc194ead089793f1bdba17e36c7e98f7ec",
+   "73f6bbaf55bd22a0e57fc072cf4c7ed87b05573f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js": [
-   "f097053ff66f43b2178f5f373d3ed15636010a75",
+   "a59868d4e19cdb19bb7842040a5e3f8202f8fa7c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html": [
-   "226bb5acfa7ac5349ea7eed8f0509f571364f130",
+   "ed844ec7de62fe7dee93091a6d6cf8de582a15a8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js": [
-   "7709d10b04f319ddd2e2e9bb3fdd82f0a0a8e5e2",
+   "7d37516c96376ebc1e69405ee35a4099c797361b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html": [
-   "7c2b4b0399d6ec068ea0204d5c5640c1582cb64a",
+   "b37034b5239605f34205120010713575b5481a06",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js": [
-   "b5cf874825fccf341bb60223efc1d54f89317b20",
+   "e125c70440dd39c18a535ff35ec3b0fc6fbdf064",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html": [
-   "69f06197f650e0806fb63fe9e074a2eda7080e65",
+   "2d429f0c8fb83030c557a44746c31eebd49fdfc6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js": [
-   "d4f33b586657b21f2adb62627fa99e9f2e5630bb",
+   "ae43a6376d7e640954bcfdaf13f364575aa82009",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html": [
-   "ae8dece63e4748af7ad70fb6ad37c59383a72902",
+   "4ac8acd74167c0a3ed208e4909b6a8bf941e5580",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js": [
-   "d96bf205d44d4257fbca6918c04294c4a9c074f5",
+   "8ba1d33a3c1f1579ee3620b7b36eea8b04aa300d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html": [
-   "b520872d083fc733d14bad089c1a19bb79514890",
+   "c673194caebb4148419bf52fed7252b9a2e5c172",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js": [
-   "7efed19208d66934947def17ba4d5ec9beba91b1",
+   "b38d84fab812c80a184390fb3c9fea1389c6d2b5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html": [
-   "3e4830e09ec8537f0ab38645eebd615bf6bc6bcd",
+   "946a774fdf03a0d55a7b692ed96e736484cba981",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js": [
-   "a61a59ce262c33207185303ae96bb226927fc9ec",
+   "99cfa25ee5e063d19e4177958183c5f2aaa2974d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html": [
-   "a4daa6498a75a4fa283125fd508700669ed4246c",
+   "ec939cfcf112dccc32e75dd2f08745fe69a8f92e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js": [
-   "404f1e4a68b3fc554869171537c69dc0a81f8095",
+   "fbcbbc9969c017b1b0d918ea98c641ba214d8356",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html": [
-   "1f33e5e0c3b0ef685275b981776bc2743cbb24fa",
+   "52da8c9cb5d3ee8e0d8e26916b0a921b3f52fb03",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js": [
-   "916d62fc7f8fb950dcced8a1da790901fc14768b",
+   "2e310de264d413f31f1a403b872b621fd5ab2546",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html": [
-   "a470d18c891ea1514cbac897d19b015a50ef35b3",
+   "d8cda7ffbbb18c23d63aaae03b926b090fbb16c4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js": [
-   "b285e101d1b737c11e784ae304837eb9cf0482d4",
+   "fbfcbae3f5f184c38766205a30b81f6f2a32b661",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html": [
-   "bcc26eb4044fc11249bad8a6968d2e340aec51ba",
+   "355ce88f5a2c144454673ecc76f034e6879b4faa",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js": [
-   "c6e7228718ee8ef36360dcfded04ff65210c41bd",
+   "16cf1932f5fef1849420aaa0c13369f6b4b9620e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html": [
-   "bb0ead608a4900eebadf2d0f574aae86ed8ad054",
+   "b9131a93b463c233f220cbdfda6ea8edc38eeb02",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js": [
-   "df611d2adbfe7029912a5597f3aaf9932028aa3e",
+   "5bbd618e079a2dd4eba5625e7f787c185dd8feb5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html": [
-   "ec9dce36e628a805c635dff1c5be97e50ba342ce",
+   "bf8bd1b5a8b440c7f9dd3d48b235955bf84d8106",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js": [
-   "246e92edddd3606225a160504152d6dc9102662c",
+   "90014c822ecdc8bbab5f8c9929e7565c1157d5f4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html": [
-   "c6e3fcc79fa66cac03a8088d7c12fd4c70fc7dd0",
+   "656eacf6acda69b6a93d4008c59f39c1ff22fd02",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js": [
-   "9e42ad507558aa62e4b6ac37339baea270294df3",
+   "251d47ff598ef6aef2b045e5eec25489f789bb6f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html": [
-   "3b9c5f05278b0286de9093ecbfe59bd0518e136f",
+   "77403cb2f1f422e058377dfa1a98c75de96162f6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js": [
-   "94fc24e9852fbb25c20b2bc7f55b33d5ce7a10ad",
+   "9222f4c5d6d8aba1154be6c6a0eed98516b2cc4d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html": [
-   "86bb08ad0102e3102c63219cf8e982a397bfab0b",
+   "604d2e71c85e18e2a12acb7f432cc1c247cba2bf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js": [
-   "bc751f74647147290238c85f1787829c32b33940",
+   "bc1d30be55f483c683b293453097abab26430882",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html": [
-   "f2a833be8dcbfde4a4b781a6454211ece55f33f5",
+   "a36f3bb9b71144e1a6ce9468ba936a28efa9b399",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js": [
-   "22ffc899204d42e1b7f60a8ec78dabc231f12c3b",
+   "0e81a834d173e5cc1dca5393d9c0ea97a458d39a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html": [
-   "84e8b3dcf99a09d9238ef0dfdd6e678bad260f4e",
+   "3f5d15cd94b29908318ea38c451c4fb3996855ea",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js": [
-   "d5ff3714d4088a145be012a91c1940d342777cc9",
+   "a53f4ce678cdcdc4c982a8d78f8d6c94f947a7af",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html": [
-   "bbb6555a0f73474ba4f9431408b2ddf8bc21383b",
+   "85258773de9983350ad1a28b72dfd8959dadcbd4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js": [
-   "c81ddae395cfc5f77e967bd9496368f7131a04d6",
+   "ffbc4b065554a40ecfde0501a16ba4aa02302b7d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html": [
-   "e127bdb13902005fb0d0a5c91f66602ead2a082e",
+   "cd88debf22a61fda7b023ad1bd19ea83cb157fdf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js": [
-   "c09ba56ae1502e6d120e43e5acb677394805cddb",
+   "b095f0e682a05f097afaf50e13e0438562ccaad6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html": [
-   "37b1eb0454f5245dbd9a159cfcce909145732655",
+   "b6423fb020563bb22b7f38c6ca3a96ad8886b17e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js": [
-   "8417215005e266d3372d4e8ce4f076895bcc4fc6",
+   "74bbab3821074003e6e7134e703d2ba944cf3cc2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html": [
-   "46f8d95d4a227228d70a010798927dbb9e076398",
+   "30f13c28f680aa94b7515f41eead66fcc4a134ff",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js": [
-   "9b7cb351cc9217b3474e72c04343e9d33e9c7f93",
+   "587a5f36cd02c02ae8a06329c9f157eab044d025",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html": [
-   "9f7b0c9672a09cb32f6875a5599ca168e8a4c286",
+   "cef04fd792b48e1ed774c4c59fb321ef3f8d126c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js": [
-   "bd2350a54123f6d56f9976eb0a1099ac8d98d43e",
+   "c2b1c2a365ec4e4c820b9fffd9be11c049600aa1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html": [
-   "8dea6f6db2f9a2e2bcf6cb8dbce03d447c669c55",
+   "17f5591e773bb489905efb6a7fb9125cd2a693b6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js": [
-   "9cbb68a649532d88c8a263517405e843ec344cea",
+   "723793643e3cadab762936da131f3eb2a6913557",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html": [
-   "518240f780da28894025612adef6c652e0241532",
+   "46174d40adf4367a09b172b1a26a6355bbbcc7f4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js": [
-   "526e2ab81e93703a1d342f27194976a5f5c875d1",
+   "04c3e81b218939775bca2df74676f15cd7896508",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html": [
-   "21081d86b2ee88e1376cb261dee213d5ebaea01b",
+   "781ebd327059b7d02b708057d6f25edd7ad5af37",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js": [
-   "95feca8ef3b4686ef68d926c38082b5d7cb55a9c",
+   "3dead73dc2d47b1ddfdc59e8a6d24cdff7df1345",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html": [
-   "69a4ad542fa5edb20f624e603d86246622b26722",
+   "be367a640ee747ac573bedfd4a1e272dba6f9eb3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js": [
-   "011ed04467a887b3827c5c702d7abf6d7696c868",
+   "fdfb1e287ccea8e34682be6dcb6315cd95c8b8e3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html": [
-   "a489c3f1d04491553c2e119de64ecd5a2e2e7308",
+   "a40c227d16f736d205ad1849b5d4cbdaa2ca5709",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js": [
-   "abd9cf1a8a9e770778ed29bd9bed0065172aa524",
+   "a456e650df5b57167001c1b6a9001c836d4e24d6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html": [
-   "80f25d32cd5d9411b69e4d034eb0e7173d162095",
+   "093e34e098fa4e4fa711c12431b594b74678be38",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js": [
-   "a6de83e44ce2b98ff3601f68522441b20eaacd47",
+   "4cda1ba32331238ec0d5884c188eb79d6a039f73",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html": [
-   "a54f88492c4484cfff8ffba466122754b09697f7",
+   "496e8b861db66ecc31d9ea811545597c9a1407cc",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js": [
-   "a069b41fbd0def4376a1141a07ec53554788070b",
+   "bf9b76bfce0c4f40d26a106296131ba72f91433d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html": [
-   "afbe418f9f74a31ad9123dbbfe6d8ca070dea995",
+   "8306b836b08c7cbac9c9d47879baf8612a1d0292",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js": [
-   "66df2f9334f60c1be0694752d2204a40a78cb403",
+   "0e20e849da6b2b8b205026ca6c1258e49ff9c4cf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html": [
-   "65307cd3385ff9417e53ff830c7307648574cd88",
+   "ccc729a043f1b0fe854d1cb5af2468d68986b524",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js": [
-   "5ca4fe716c510b47ea2fa8496a80de94d1df8fc5",
+   "312e0402ee51d4d4fbdb98edd821b6d5ec523d8b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html": [
-   "6546bdd0658d9e494480e5f0f2e4c07a6e0ffd31",
+   "07a563addda244954e7283396a918c1342d1e658",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js": [
-   "2a6c368cb9a3ad1a916e17a7c0d733bdf9e56baa",
+   "93b59bb0a41b32f2d0b7d554cedfb9b561c5554b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html": [
-   "fa2054275306c5f058cc73b3a3b0e134e681f857",
+   "4494782bc26b9873490e4594d8dd1c0b4aec9f48",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js": [
-   "abf4d9fce49f22cc940fd67f3336af97f39b2f67",
+   "3b373ee95a8ba754e4e5e3b9edf843642399b85d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html": [
-   "b5741203352a3402a0a48881f86609f771ad5adc",
+   "525f207727e5d06a578e4a8406091db53c7d4d04",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js": [
-   "aef17eeb96428ea13682df54c54d42a7ab0e7b2c",
+   "b71f1512c3f3d8e2de8335851b170e9f7cb3b084",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html": [
-   "22d2879741f9f9d5b315eb21b64aef9f6d26a569",
+   "80210a470621a2149387ab3edfcdd32cc755f417",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js": [
-   "49228a859311ebdea90fe98fdf9efb6f6cde0963",
+   "37e719d4b89375a3afe406ac29a2f1441ee65065",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html": [
-   "22fd3291ae0b64a57e315ee50075f35338947ad1",
+   "3600ff6db222e868f9f3aa63d40f08557e30d009",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js": [
-   "956dccc7c1f6473ec15206ca12ab687049f6f66b",
+   "2f5b4e91b03bc14386ded29ef608dc65b6449d0c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html": [
-   "3e919ae605e0f66cb19f85a1991891cef9ff7acf",
+   "5ebe2ea71e62bc723c802d18e66f6263f000d778",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js": [
-   "29be2d1732d1196cbd86af6b4bd8925b8bcc758d",
+   "f401f38dd18eeb5302e4d839cde8681af64e19e2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html": [
-   "8ea7e07896aa85f703f7f2bec8905ddb80a5aa17",
+   "f28cf49d0965c8befe5cf89a40cae2a58e393f4b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js": [
-   "44be41e48eaf0589817bc9e730fa033acd1b16ba",
+   "86115a888c4696ec28993cb486a02283b03080d3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html": [
-   "429c0e6e97527e2cc53b9b79af74272eb3a21c55",
+   "8779bf954e221bdc9af7f33da652895abf5fe981",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js": [
-   "625579cb7aea561132a6aa2dfe43fa7cb932a98c",
+   "216de5753c3b7175e1045d31aabb219fd50cdaec",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html": [
-   "62b004bf99ffd31e0e36587f5c80a2e3e2009332",
+   "a4a3e79c4c4fdb3a44230df106bbf17339a87b78",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js": [
-   "1650f4edc0ecfc98381b1dcfde118adf191e26af",
+   "7a7d34d73b446285d9179799f1e1dd72846f9dd2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html": [
-   "e68ba60acb9dd3bfafb27f88e33c75d0925f9ab3",
+   "23362f9b0bab358a5224b718af93802bb3a3d87c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js": [
-   "6e638a7e5e6ff836360ee9d7e4b9441ebe8849ad",
+   "2db04585a4f02f4fbe0f6c3e0acf99c503a86d21",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html": [
-   "0c1f5321491da97c06362ea32a7280992fd9b2ce",
+   "539a9c10e858a2ae6839aac0b56d1a497b697d6a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js": [
-   "c4851d64ecf48ed8989a6177e67f2ec13d99d851",
+   "e817e05f261f30d4114788f207c586a81bc14b70",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html": [
-   "3cbbad8fc9cd68352b730d20d229111c369e5000",
+   "89a6e8d015a5b4d518b4fe7ebf933d3f17fe82b9",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js": [
-   "f5e90c2e936b5a3042dbe7097aeb9d33f3d8e61c",
+   "ed3e6f76ca1534de422e3fcfd513da352284ca69",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html": [
-   "735f6a0b8cbac2c8880df768f74078ce374c2c4b",
+   "a5c4e2197f936dae491242b5dd9ad58fb09d8073",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js": [
-   "583ac2549bc5ff1f747cec6ef78d31e04f60dfa9",
+   "a6d1ebc7803c22e82658932dde2bee56c9711437",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html": [
-   "65091f5b9297f54991ee38aff065465cf93bbd65",
+   "6bafa6bb430b1eea013e55acaaac969675acce38",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js": [
-   "46a98b1cce5b4af6bd9c22d33b6c6aaecf60a108",
+   "f01708db9c0cf0984da0e81fca0c5060ae977c64",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html": [
-   "f433c9d8f325c86deffed0f0a5bc6df89e9151f7",
+   "28e3d6e9a36463fc8cb2d28dbcafdf3853701a60",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js": [
-   "135d692c40090e89a50f0b74b803e571efbb7b91",
+   "ebb3b2506f5e97a655ee09ab249ea0a7645f2d0d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html": [
-   "9ca76c5ecc8ef651b366f21eaa9242828499eb67",
+   "2c7f7a12b1520cba388fd33d6d2633828aed4f81",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js": [
-   "152fa384aff2250e5a8c371ccd42013d8115baba",
+   "9ad667cd03028c393b1c7400839738d78dcab873",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html": [
-   "bc423c2d91a61042fcc56a4b55942f0db683aeb4",
+   "5f13ac447cf03318cb9b54968e07d910c1669aa3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js": [
-   "1fb26cf5c4ab7cfdbff517a709fd49e475aa0b6b",
+   "e266c44581c6537adb70f33e0787a3d4497de1d5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html": [
-   "659c8e01200ddd275d6498d182172c1c89061c74",
+   "b91ffd7fde474a0f1ede66b6fbcf167d0dde64b8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js": [
-   "fd4ac9603899728cb1dd4c20cfd871d736d3fc87",
+   "d3c39f115dd45f3554341a261343419a33ad9e32",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html": [
-   "bfda01c121be2a40c2346beec38100222436b85f",
+   "2d66402f521624bb869a9daa2cf42e2c822a81c4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js": [
-   "730acae40d3f6f847f62a266d4e4a4d09ffe1ba5",
+   "febaa5f4174e15c4f6f630037eee219b8ac7952a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html": [
-   "7d3ebb874e104728bc3267794eddc57da98d9e02",
+   "fd2ee45e9be344b634eca2752a6fce1b6aec9bb7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js": [
-   "1a401aa7f86111cef5ff4b904417d595f8395e77",
+   "9447c0aac06443c7f2bdb564d38343ba9bc06b2e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html": [
-   "e63732896e849f6982993a5b0527d885ee5f8251",
+   "789c82efb650abdb9dfda0d5d12288abc3132df2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js": [
-   "c6832d98ce3b91ca1cab9ba6a896e582d6ad0012",
+   "27652a81aa698b210c1fc4148bb6acf043c6dda0",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.html": [
-   "d76252cdae19f972d58574c380b22da27fb4eb22",
+   "9e4c4d9ef38f9f5ec43a319f945f81d8870e4705",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js": [
-   "ac9b6e162d55c1a1451689d3d673598fa3bdcf80",
+   "a83234f7d033b32f3230ede7bf99c787aa701f25",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html": [
-   "428d440d851f310b76b67bb5d6b76bbab35e3548",
+   "e5a770291098d4bc02dd0c9b85da2810693a262b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js": [
-   "0f0132752ba62289855d6bb64ed304c7a7e8a998",
+   "8a284be783c3fff0b7bfc56fdc4bb44fc235c1c2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html": [
-   "ac2fd719c286609e5d70bdc4c65846a3390134a8",
+   "f270720ccd4c71779ea36501fc856a9ff159da8c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js": [
-   "4355567229ebcc7d2b2c2895c7e210d1f54380d0",
+   "1378a4a2a82107f29809944762770e161879e3bd",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html": [
-   "85e835de461886631a9327d3cbc83c6346ea8b6b",
+   "7bd8394b6cf07211369badae93157f3d509f42e8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js": [
-   "d274b8628f41c8b93d26b7480938cecd6d864b5b",
+   "f1196f4b064adfeb034d73e514013b7814eba905",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html": [
-   "7a73e5c2292bfdbf281aefbd4a1f671a354fa64c",
+   "01cc8bfaeee22691f1d3b51ce9cc88f30ffb9ea1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js": [
-   "d57b1961ad2e73db5f1fc95a9b3c2903b088ead0",
+   "caeb9ec4d4023bb470b99ae3d843669b1a3772bd",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html": [
-   "6d1fecd4e3d153bfab9104c99ad31394dce0e768",
+   "e56ad677f41f20abf61d7df820a680c740536a97",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js": [
-   "ea043e51e014875d0a3197e80fe102ed045d6526",
+   "ec0a3eb80807491a4d843a4d0c8a591cdaaa166d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html": [
-   "9d8110048c4618c41bfd2cd234b7c7f784af1cc7",
+   "42d652c762f8efbeda138ee109f261bea54b85aa",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js": [
-   "c2c9ea051e4de59477776a5dadfbc901f900ccc0",
+   "f254388e8880b59ea9797ff3411beaa3bfa730ec",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html": [
-   "47f1a229c0e6b1089f6d34639d36db782850ebf5",
+   "7c9f31275c95ff55449bb6609785543c9498fa5f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js": [
-   "3d975770643a0bb6867b9449077ba9cb382a266b",
+   "1c5e0813d10da4c4e5c2b0c382c7a5e2e052bcdf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html": [
-   "c9a1d4971543590647b8d27877b77b7dcc9e5d16",
+   "d7dcfdcf9541e3503a786a29a2c0ce0065a7cf97",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js": [
-   "9a6c49f2eee1a28821f58def657ad9a5ed31e676",
+   "b0ad12f9b5758b7f2cd21b8f22b3f571a646a021",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html": [
-   "104f8806db6f4c10babba5430cc2fa1490f1d989",
+   "beeb1366d570ebd1a9ad622f5faf0e27d2d6c5fe",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js": [
-   "2899f40c6d506cdebdea93e4bef72e49eb536d8b",
+   "c1aa4f2598d8fd3dc743cf5fc141cf572af42fe7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html": [
-   "2d96d02245e9b8da7813898fe58eab85ff5f8e58",
+   "fdd30caf9e9b2df9af04bb688db0452ffb049ab6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js": [
-   "ff388b974ce73850b6c3459d0ccc417f8c2a82e5",
+   "dbf5d19a5d87de7363eca3589d1f59dd9a075371",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html": [
-   "0ab6881a440b1ab9302db409948d0cd0919411b7",
+   "d239397fdb72ebf09bc6c03c83d7982777266cd9",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js": [
-   "108e36d4bdf9815b5646f58a1c4d2e288264806a",
+   "dc01bc78f1b9644a80880f9abf86d8a3643fe9cf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html": [
-   "1093a5c68eb829b1987059e2d69d56feec0a8d4e",
+   "1f52ea33d0feb4747292474034dc5536c639e90f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js": [
-   "8ff720eacc34065436d2d03e4e8f4b1ab50485f9",
+   "91423b1c2e408e65220db35a8ff4b0fbb2c0891d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html": [
-   "923e8ba4d27336a67c99132ea0bc6dafeefbd102",
+   "61ffaafefcbc74b59c783a5406facc724f000cb3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js": [
-   "8607b34b217fefda4d88b8cc519da285d60b1db2",
+   "c45683041995f97f821d93e29531441966844dac",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html": [
-   "cc6a80adbdcd6052ebbebdf2ea2d94078018f23b",
+   "8a448e2343fd7fe05a286b2acbc5cf989a05ca7e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js": [
-   "6ffe0bdd01ead73c571e9d228825118b69acd3d9",
+   "daf541d407e87344a0171e7b59a8e21218700923",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html": [
-   "181e7ba87662f587672bff4118fd4a1e9b28cf59",
+   "eefa1774c0b900a015a26384aff1cbee4b508691",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js": [
-   "1a6600e436f1314598270ff66bd04390fd0d775d",
+   "54e53c07c2d613cf9740ccf88504b387641e2060",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html": [
-   "e190de146a5261c305e012655c00cb96b70bfd4f",
+   "fdd9d46ac5c5e7da45bb294cb07caa2a5250a9a6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js": [
-   "b691fb55a5f67d3fbb4a25c43f80cf95c32daa12",
+   "24b43f19c4d957f56f758b70fae07c5848cddf9a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html": [
-   "ceb0af4d3d84329e79ce7636608208432cf3fb33",
+   "eec4b9ebb5fa6a7725f9f4b83b0c728ab654d122",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js": [
-   "c7c3058986f1e928f42b162b758d3bd60fe9c886",
+   "74bd3968f4e30b0e9fc07211cbf848faa4ce705f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html": [
-   "f8e00c7b541a3f57c56175860fdf2df47bdf329c",
+   "ae0f705fa2048bf1e4a0eb014d0fce873afde28d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js": [
-   "9256e7ee48885a035f9409d521163326c1c29cab",
+   "e2e5cb227bbc576fc375977a40951ff7e45d1b98",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html": [
-   "40cd7fdef09f021deb2672d5cbafe3df9175b851",
+   "63feee6b7ecf9bc0ee1baeef50249790cabaa2a1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js": [
-   "5bbfe6510c5c8164a6a20b5e8718febaff7f132f",
+   "6d987f785e212f2a335228a1b56b815162ec1dd5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html": [
-   "cd896a258a9431ad227292cb21392039b56d92d4",
+   "264c4c5adc63117182824d3d77239dfb73a5133f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js": [
-   "a3f98172c8471efdc23d97b97a4d78253e56721c",
+   "cafe61aede7e506cebe10c6c26e245c4e68e09ac",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html": [
-   "4e340b690b35e3e4407c96f522e6a24189f3ed1d",
+   "3c7d58e7b9a56d057bcae59377e4ec1c4668fc7f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js": [
-   "d1de7c52239d4b68cb9cbae3130b7306644393a7",
+   "573137379bb384603e915bb5dcc189b1979b04ac",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html": [
-   "842739aff01ff0ea33461d3879f6c6857b4a7547",
+   "e7c0d26dddedc1fd43636a333802bb5d993d95d1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js": [
-   "13674bf27df2f0a1f7d8996be9a0e2ae97b46042",
+   "3fd5ec44105c9c0fc99ecfb68bd54fb36428551b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html": [
-   "3368ef2ef8de96f374f465f876a6d84db8b738e5",
+   "7dd3312ebb4c65d3417633a2f7acbde687228426",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js": [
-   "9346d014df3371bfc154478a70ba75d096a13a98",
+   "a8c23e02f0167a21188432290e6e40e3783a9bc6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html": [
-   "4c68eb1128ce4059d9d19c3261d0b4736928fe75",
+   "b2460045cdf5397ed47b59c3797a2320f5cb7093",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js": [
-   "88232771e199d7d60fff15cde1bd7a7552d0f18d",
+   "3d3dfc135b707dc08b256466d4d4c8c5cd06b357",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html": [
-   "9e2a2ff8cf0528dd0234f2e2842fcf184e57c5d9",
+   "b54d23efff55e0019f93ae7c3358720ea6b0b288",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js": [
-   "64ca3fb3f1eb00558919b722bf7396ff20f17862",
+   "ee30d326d19e1114a51a58c83efa528c6b84084a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html": [
-   "87b1c49492dcaeb88f10180be5cd922be1ea8aeb",
+   "88468d9b5b495b104d1a2704c7df59707c214408",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js": [
-   "8f2688972a6996018219017713aee78521a1a5ce",
+   "5c6be3417f8f0d144e34acedf1bf2025310360e4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html": [
-   "c17d8b36ea6f024d2b1de30eb476a717adfe88fd",
+   "8ffb63f43bc235feeb3d3c1548ecc25b9a1e61c3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js": [
-   "3c3a53986219552dae4928c42b1cd2f6027be573",
+   "ac73b529de3b7596bb6f3e489e6ef7c303226036",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html": [
-   "5b49863ae6d4d5cf7b376ac6542685e0fe8623af",
+   "38740899482eb571a56c337cedfa44abf9701b23",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js": [
-   "13a7f67b28f8be379cf6b13e0cb5ff522d9558db",
+   "f4239ecde074591d1c76885d7bcb8e7033118af2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html": [
-   "e7b19bda497a8dccb7faf4ee0c126b37998e9700",
+   "c35a2c4eb7c8b4dcb79546fa5de0713a1f871afb",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js": [
-   "faafa6ca29878fb6ee63a8e82afa474d87e7633d",
+   "093fc7896a3805b2458cfe97e2c1e12de09979ef",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html": [
-   "058f777aec59f2590d61c96f679f1996a8aba4d1",
+   "879e1b8e17e461643737373493431988f478770b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js": [
-   "6ef178fe9d596a72dac5ac46d8254975d921d208",
+   "d2252c22174aaadc4d3e775e1ac1aa20f833bff2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html": [
-   "073bd73565bfb44b5ee45ad7377d48c5811c86f0",
+   "34cb3e35b34ff3029fe84286014aef8c53904bc2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js": [
-   "9f8c1059512614d0827bf5cab9eef4739d46db83",
+   "a0a7b1ef6935bddbcabc61f7f67b3000fe00fe36",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html": [
-   "0a3a777d72575ffa105e988e6708284c6af2194d",
+   "6e0fbea5a940e2d5a4d99cc06f0626a688a200d3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js": [
-   "f873d14c42b303055d071a0cc146e9d3b70aa0b9",
+   "ced583be32042dfa5148e47d96eb45e8c0443f62",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html": [
-   "f35b50f997d9012b0c39d8d9c8031d9973edc9aa",
+   "b524aec49a4370e972c5cf8f7d94957811ed6bd4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js": [
-   "85b9415cf694b4fb4a500fd12a144874e15ce8af",
+   "c08da34ad9ce6bd970ac93e166cadd782bf8b4b2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html": [
-   "a49efb342def3e229e07bbba4d9cdb44aab97a6e",
+   "a727898664a7a1fa8a35982d95397449445c1a9e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js": [
-   "2e99264ff953056bb6327dbd0a3bf4f988a33a9b",
+   "268176fdfec42023f673aafe37d95858d0f6da37",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html": [
-   "31c3b3b218aedd601db4993c87663fa9e05e5435",
+   "8b99181c13b19a4647ec0a69df0c70daa4916aec",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js": [
-   "d479378e1b4c9a378e89d07accb2c213346099bb",
+   "2982e573bcc04a33fd8d0ea8a5b5bafd62565865",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html": [
-   "7d6d4cc7c4185f7a77e8a2f24e0f9226974b9e5d",
+   "7feac02bef0c534712e3186f73bff450eafd1ab4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js": [
-   "6c43ce61ecf7d117c733f9aed095db6d8e514e2d",
+   "56a003fe00993ee3098207ab9c67a0121ef9fd1f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html": [
-   "3fa81d55b159bf40b5b392cd6d308f00eb7b9cee",
+   "9137789fa7742cc1affd18190bdbc55d70a54187",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js": [
-   "2c5a99680bc74a5615d6083ebe3e473faab49c8b",
+   "fd198ba7a9a47325bc4dbd438a8cb724e6eac844",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html": [
-   "196b1540bdf0efdb39ac0ceea755f6ba329d38e8",
+   "d450975150fc710490de15eec11f4f6dd3613cce",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js": [
-   "0374288d3dfb27d3d177b62f61ad105451564136",
+   "940e50bdf52d0cf5a37de0b0fdced499d35f91ee",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html": [
-   "61f61e1f9e5ec85200382b7a513b69136266bd08",
+   "2b16c0c4816572397701b59dc4f20db519e5b6e4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js": [
-   "2b6b77fb77b3f150f7586f76285ea47b46d17378",
+   "915b3132b119a31b15583be7e1efe01a879f4d86",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html": [
-   "888cd24d925981c4ee3a880704438dc0cecbac6f",
+   "7f3bd260ff1eb0ed416e2a47a3cb3874abac3897",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js": [
-   "77793f21d5b8e7ebec308edf89a8ac415207ea0a",
+   "940f55516e4565c4672c88b892a368b7cce1283f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html": [
-   "6f23cd3d537bfeb4536dca7a09ee7e26a9a96cb8",
+   "e6cb301d2d8fce735eeeefa72890db78be9f5364",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js": [
-   "0f384fff9406d48d990a5429dcf0dffc5015f94b",
+   "1374dc0ffef35ee0c42a9b77c51f555d30f0cccb",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html": [
-   "b5b35153cf00a58165f79d00ae37894291afc778",
+   "3347fde5048da3cc320608ca8e092ae58ccb6461",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js": [
-   "88343536912db2e248f8b2d7b5d2670000772a17",
+   "c7bd7dcd6812d3d377a076612de44062f0d6beaf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html": [
-   "a406acee58c8f2a5a3f3659b26ee937919345f37",
+   "16d385e54f82b5c2c809050115a1764ba90a2320",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js": [
-   "0781729301735062b76dd96cbf5b547d988a254d",
+   "eadeecc7bdeff40e862217c01648bf6c1c0f1434",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html": [
-   "b7bcd456e52f2d5475be61b79953fefca049f588",
+   "eb4be0d289a9c7d0c860ee7cd732db9bd95f90ff",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js": [
-   "20aa6549321f7f2cd46662b65d6fcbf7ba261eaf",
+   "053738e0b50513db77d52d6197e557515a004ae6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html": [
-   "638159ffb32bc1746a6338350d962a408b1963c3",
+   "a7a3697d74651c0b8df3fd2c68927901cfcf1a8a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js": [
-   "d99ab57b524f721e68b652ce3d0d3736b6dd9de5",
+   "60769e7170590d2706ea1b7ed6046cf8006a9312",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html": [
-   "3599f0a58e3d49d785170c47c864113893c6a8cf",
+   "e84fb5b59b7f511d31b910db8b80bba13f9bfe18",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js": [
-   "2b81e8ee14eeac682da5a51c37e9a0b3fb296b9a",
+   "fccab52fb6e9f73421f302e9a26148fc6beab5e7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html": [
-   "9df6a9b40148cd8b67dbbce49f8b3f96548b5144",
+   "1b2a3b225698a674ea6bb2da5da9188acf905e79",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js": [
-   "2bfd49319dac461a0cf660a29c39192b6cb67086",
+   "97abbc96c19bddc92c11fc307c2355d8a9c2b6d7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html": [
-   "7e8864cef4c326310adf96405e4ea8e2b0d9facb",
+   "471b67b13d3301e13e8ba7290a87604ef807c556",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js": [
-   "d2b25f5e574350478781b7247c065d57f37a61c9",
+   "86c1f29dd65589281a689af415a30a4eddc65f52",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html": [
-   "9205923db6e49764f9dfb7cc96e3f21e1fef716f",
+   "8f659f78ff5b299a3fd07609e4afa17802221080",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js": [
-   "50b9eca10c1c836fa59341eee5d7595fc3570908",
+   "2afc6bb7da05957a0b089fcb214232957dd24f2f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html": [
-   "7b79a5a6df228c95ef4b283c2146d61ef2d8ce3b",
+   "aa0e9a5a1560708110fd769499bf71d49b8e6c82",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js": [
-   "4c6bc4b2c51a1967a58f415262aa82fc1244f2de",
+   "d3c97949f1b61bf28db801c21a7b2cbdaff3aea3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html": [
-   "4f1e0804f7f517f9e3f74c5856649731113f6db8",
+   "c40972ce44288df5c821693bb4eff590140890ac",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js": [
-   "1c32ae4f070e3435d290456a8b216666e357b1da",
+   "f25a2cada6e2dfd6210897310147afc9534231e5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html": [
-   "7684a185d5cec79c873ffeb84c2b4e70dede1ee3",
+   "52a7883323ef0889583c72313ea1872c028ad35f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js": [
-   "d82c64faa7a9a73d5624c3c3836f90e11a353680",
+   "d979eec3da29b1fbb5e0b3243dfb954acb08d08f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html": [
-   "256992b643254850533c8866c5f208f3f7cac778",
+   "f04ae7c1fa1a3332f3000a191b0a15a6447cd5ee",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js": [
-   "b7f79a2d4544ca74d6ea09e4e23887be1fae8b77",
+   "5913a7c83d7bc51d774034408f1c6b45636de9ab",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html": [
-   "c5032d4e2e193081a6dd9aecca025d93450e788c",
+   "d21b90650958c89052c0e22adce39f1b34d6135d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js": [
-   "f3ff4ec5e96b52a5324e4a5a12a9f6498a3aa793",
+   "c1d14b5a27fbae9854ddff6332ba15eb10797ba6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html": [
-   "592f798aafb99cbc5fc98b765a7634a771efd16f",
+   "15b2e49d302438e1fe4503113dea3e7fdcac713a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js": [
-   "06df1feea17652ce73a6961933580fedd314a57d",
+   "ac1150c8099022edc7efb0f4f79cc589a8a9a22a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html": [
-   "433559e3b834bf520a06ce905de12e694bb395ef",
+   "daf6aa3a8321311bda41e51c4d7a1c268f96d4b2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js": [
-   "7fbe239f13708dee59c85043331d0483360dc021",
+   "2398f0aebe0ebaf62a25adea91f591a2a97ec3b7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html": [
-   "6785eeb9c11edde63dc764c8bd5506f98ef2236b",
+   "bc4060aafc6496bf5e0e7affc1a45937d60b452f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js": [
-   "b35e61e8231dee6de0ba2961847b5fd15f16255a",
+   "415a06d444516aa74ecc3cd33eb7c6cda048a90c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html": [
-   "06e7676cc069c2dd7940c83a63cf30f16031f336",
+   "ce93cdd6ade509847df8ad376db5aeb40c88b5f0",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js": [
-   "c764baadc60cbf71aeaf01bf6b3ef0cfcd1d4130",
+   "78335b625a8fc104b6b4a32eacab56db830acaaa",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html": [
-   "c30605d1f4e234c9147ba28aecffb0d11ca55e9e",
+   "25cc2ba560ea0adfff25f60a05e54e476dc909c5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js": [
-   "a100ab7782d9c1c49b5a698cddf81be7528e7722",
+   "4caeb027c0af0bad591e904aa7204ee0418d58d7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html": [
-   "74fa502c7d66ccde08f928126795b614a0d6d9d7",
+   "8effe1e000c930ceb2f240793e7294e5ec047605",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js": [
-   "ff97e305b912e422cb7fc9718e2894b6baf8f1ae",
+   "d5047e934b401da997a20eeba1aecfed122e8639",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html": [
-   "1894270290be0bcf256db6072969853796805334",
+   "d8caaf973fbaaf1e3a2d39fc8e68109bb0e8cd82",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js": [
-   "1330db9e2c093b242a6fc1f33963cb9ed0359d41",
+   "0b45ee7f51dbcc7c5d42c638fbda1bc2bce6fd5d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html": [
-   "fb7e6212bc9534590357d6d3d572614955397e9b",
+   "12116cd30c6786ecf4201b0d2e071dec15b56782",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js": [
-   "58e7f4c7df516fe6348177193c350c8bc7f5bf9d",
+   "8bdbfc7ed71f04c92f66a37cd524f5c6c4c91503",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html": [
-   "81825a3d6d3c5bb622b280698a18a9e71f59429f",
+   "0965fecb280602281f56125ded4d4f8c25ade90c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js": [
-   "dfda77763c84ad6345bd921742f15c644da31b1d",
+   "862b76421f29c604b32b93273634cf96e4eb8282",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html": [
-   "a300e3a37796a85c1e1f66c63d763f3d56add680",
+   "d120398cc22c36e441cb205bd379b93760c2572e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js": [
-   "3d2fa4c4b5fb9a5a6264ea27ddf41fb67e8fd3c2",
+   "88c117536064bee2ce93236db9f948526a8d405d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html": [
-   "e9d8a1c139a59b5f4d677aff745504a258d99136",
+   "4b34a982cc50c36ae78eed7532dec73e9c3eae40",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js": [
-   "47a95b92a179433a6fcadf8eeedd0610e2d585d5",
+   "caa5274ca8a7d9eca26f523a415f6f293b3334d8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html": [
-   "04742747f724286d19de0c39e063532369a1127e",
+   "893ddf85c73e12b048d3a4c3f24d7ba188960d61",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js": [
-   "e60b819557c647588602fbcbf1f0747e0f3f0da1",
+   "4576c9023ec8fe186176ca3eb474969dc77cae82",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.html": [
-   "16cc536ee5ecea4ab55548c01ceaec95b11b70cc",
+   "2ec3e23df0bf35389e6d29c834590b4d7b6b91d9",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js": [
-   "2d6e6bd54d77b50a4590b818bd4ac63eb81a3b3b",
+   "a9fa811c7d2534c2a43066b3842ffc7ac6b382d4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html": [
-   "7b12e22552fde663fc03d2289183c519dd443630",
+   "3db8189b8a79eef962608ec670a225a924159166",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js": [
-   "6f50f04331caabbd5af00a294ad862241fb833d2",
+   "b41cf0df6c72a2a07a51909f8ae886d447f97ce6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html": [
-   "8b857b9ae1b88e65e26fa587efcc465070a9a797",
+   "45ee2e1505f2899cfb036663c3bb3cd6fc079166",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js": [
-   "d0e6e3f72bf979aadb0bd3ee689eb56dca9c8019",
+   "b96bd0b1868d0279c10f9dfc99bc9e695a900fbf",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.html": [
-   "f6d79eabdde7af18f0e29c7ea456f28b13b82024",
+   "6d7049ac84221738dec2606ee7af01e236f753cb",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.worker.js": [
-   "890171cfa1813f8cdb5f25ec99084e23dd7344c8",
+   "85eb31105a26c64421c89cb19248fd16388a6d3f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html": [
-   "f5af860549939007d9a38d5321242ce91f1854a6",
+   "34b74f5e27fa45fe9b7d7fcb38f1eee5b2d81b90",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js": [
-   "32d429fd69b9b38f561bc529daa4dadd0fd05e0c",
+   "6d7039208cec5cea634784ce4c697a847a4d1af1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.html": [
-   "7cb6d0e059af856525e1c668257b8bccde7269e3",
+   "742718f0242403d5a1740eed17b496358100eef3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js": [
-   "670099805831a8a9c5e1401e96b714c02d92054d",
+   "4dc0b11a4e7f02fa28549d7f93e3cc501430cdc8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html": [
-   "e091155c7d981e99aa09c75efa4038a7e794e606",
+   "3fbd3adadb3f835849c27ea8cde7223cd7f267c8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js": [
-   "0bd86f7c1ace2a75779de3b13388af7a4b3bcd94",
+   "449cfdfd5db66157073415509463dc5948dbbaec",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html": [
-   "2056b87bd28ad7f8b39f0af693e5e0e1946b0683",
+   "86cb98a0f7469130384846a42847e1bfaea614de",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js": [
-   "e7a085786193ee1b945c43eb16f619e6d0c9f315",
+   "98ee46734fcc99adf462744bbe4f76fa0c52a52e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.html": [
-   "cc1aaeff0c8458802aecc73cb3ab0e619355088e",
+   "6327d403037cd4d68417ec986c73f5677c4e6ac1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js": [
-   "564ca3c5ed9fa71c6d541d69902faad3692628fb",
+   "d5619173dcaf89d776ae3d4a77b523086aead99b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html": [
-   "aa4da5160de8ae68441538f2efbccc905a3d28e3",
+   "cb68a6ce19b1d1193717aae90bbe0cfbeba82c1b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js": [
-   "4435de765c72822841ea403fba9412a02b5eb60e",
+   "0c1bf2c08af5887814fb88949c6480ab77ae4878",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html": [
-   "7151fcd180bacd3a3b23d71f9954dd82a3b7c9bc",
+   "a8ab738b419d36e0af782e036d8cda0045b5857f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js": [
-   "2463b26b584a9316f647abdb9995bbf98f25b8ac",
+   "c0c36435e281c8720165d714aaef5c77d3d6f4ce",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.html": [
-   "1c1bd39d0f416a1b772325628e52ebab90aceee8",
+   "b1fba4092a5b9e100053a8b58bedad41e5d1364c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js": [
-   "de746abf80a3188c0600f6d7eaa5e2a333323457",
+   "4a12289f2c723d490491cd1945b33f237ba62251",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html": [
-   "7415e78f510fc78cd9da3fbbf86e4500c7a5ac24",
+   "a3eea4775e6321020a3be1d3c5924a0e12f314dc",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js": [
-   "01f9a1133bf1ef91c267e1f9ad552cb71a415c84",
+   "1c1624d6c244080409dab3c15b85ae9df4c457e6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html": [
-   "fc2ab8f8dd9bb47ca7522bd5c6ee6d95ff5c4705",
+   "cc61b50e48b252a031b8e55da64a9b9e82120301",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js": [
-   "2f65344471ae5e4c8e9d83ec7f9d4be398ecf59e",
+   "f3242c21314e6d9e2a68aba230efd1b7189df76c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html": [
-   "162b22e9d805141e06ffebc42353d28eaf056eea",
+   "3033c94e25c8f6d777ae28659388a5864d9418df",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js": [
-   "621317791e928e3673cccbff937f2d07395b2931",
+   "50e860057144e10c296f9b42f560654410233bb6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html": [
-   "5283eb6ff32d95c87aceda705d2ea6b7820df57e",
+   "ecc610dd4b41a933c89b7b0384135f06b72a6567",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js": [
-   "269ec5bacdb467b58101ac4f3b4576a12aebb60c",
+   "4624052020ddef7dcaadc5e54a29bd068fe70f2d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html": [
-   "e5d04f5586b09e1348ba95d9ce7d299dcb4341fe",
+   "c6a421add3a9cd887056437e4c9ced3f4975fc21",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js": [
-   "bd4e780c99d78a67c9cf29cf31ec8de14923f0cd",
+   "dca239c9bbd42962b4d006143d1bec6d6a461669",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html": [
-   "162dc606c3a844f10ec83599f2e6e1042abc034a",
+   "51d48ac0fe13bdb0478fb2d3b04a8fbdd0285026",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js": [
-   "248043deea56a7adc82a34d3926458603dcccc3c",
+   "c8268b009937b065ba9df93502d8d8526a909ef6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.html": [
-   "350d08c9a2ab0cda181347263c851915406c2ee6",
+   "797802ce89d0b2681808e816cd2290eee118b53b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js": [
-   "7154253b6e69127fbdcc95c7bb82fe5597ab285a",
+   "ada0b9689767e94cd7d5bbce365594db06729693",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.html": [
-   "c1c42497bb2b3e49398be4a7434eefa0e0f18870",
+   "80b87919efdbc16fc3b90fe2a99330e9abf844bc",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js": [
-   "016dc6d6037e6b820cf25f9508abc9017da36c74",
+   "330582495205f7bd3c4f46ebfec5dec9052ae0ce",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.html": [
-   "1938cf4f961b03cc0bafab37732fda730ac211ab",
+   "c730bd5a89742ab395fe804dea4e44eb9f747921",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js": [
-   "69a97f97ae778752ea35a83ba819e4ab98bfcae8",
+   "5455f24b77bce193f9e9776699be92db9f99aefb",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html": [
-   "ba4df23777983619c8d1b0bdf258f5c9e490d50e",
+   "3020c60a6835c0be6227118679bebc2f4d872209",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js": [
-   "937e1890c517a62c99aa259d352215c20fc9ca12",
+   "f908cc6808ebf6f2fd734472e388b9dc1c4a6d3e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html": [
-   "9a2fe69006a0c3fba193ecbbd7843a5e92c17190",
+   "e7c22e3629398d1d243ff665362cf0f722889016",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js": [
-   "e111aa99644170e51fdc2a327a640b79b9232cba",
+   "b4f284f7c70da1aca5324d9d52667cca2068a806",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html": [
-   "63990930bbd0f8428be74cbd2cf1629017e7c9f8",
+   "0b72a83527fcea6f87cc2c03f6782a1816bb0f32",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js": [
-   "2483e3f8674e583b4c9e515fa65bbdc4f9775340",
+   "526edbffb6061819b70b83d57942b065a2f8769c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html": [
-   "813c46cf43ca8b28f6dbd765c58c94a4e2d45ab6",
+   "d841895c97e8c36bbf56e1f2998d5c1ceb02147b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js": [
-   "366cd79346b4d3dd1496e5427652f298f71143e4",
+   "23b5d7a3d856cd067e21a5933cf5b3dcf5aee213",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.html": [
-   "21835db43b1b92febcf334f293b3044b7a6a3017",
+   "66fa6122af38b24b6a9996bab802caa627e4b52e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.worker.js": [
-   "61439fbecf5ea4a02af8514addbe9295ec9705d4",
+   "f6c1531d2127bfb64a190c88b0c5f04427ec54b5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html": [
-   "c6f7e4ae85145e02e48744e35fa17bf1dda564cf",
+   "45292dd6fe1c185da1f46d466b010daabf3d6484",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js": [
-   "ebd4517fc9d96467507901105de43fb4ac6ed101",
+   "9e20c3b42e7ee0057eb20cabaa55087ee0a9a125",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html": [
-   "57de6fca70e169209bb1ad82421ad8587dc02958",
+   "e1996ad8f7b68f63a57fddd93b5cf0891e7ae1a7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js": [
-   "5aeb58fbe808158e09aa70842eb39d3d0c8255b1",
+   "2bb87921992e9a08579ed3a0b24b190c89598aca",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html": [
-   "e7e1957ac2032097d10dd1db5e5d44bba92de010",
+   "a4cac0952115944be0c8ff78b80cd9e410279b0c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js": [
-   "9290614e9f058525708992bcf3750fc6e06955ac",
+   "9135f2869d47a397861d93072566d3feda4a056c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html": [
-   "70a4dd0c4caf7bb95c9b56b0bab9c03c030d3c55",
+   "234c8f2482d5fc5927498dc6d6dc6e1acd9930e4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js": [
-   "340b87cc7374cb084fe89231a80ecb6abf0e13a9",
+   "07866fe48db6ebc3c84f52fde0645c3da7fe232e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.html": [
-   "fd6f2d66b2e2809eacfe30423361dd95efe16a70",
+   "5ac1de86a64ac7bed2c03129826b06531ac7050e",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js": [
-   "30addca953315a50a9a6968ce3c63ee603a2ed91",
+   "4eaee47f70d1935a08d378c1d76ffb19f9e68557",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html": [
-   "84c95801f37e466af6d8fb54b99c1bbc8a05eabf",
+   "816156628b2e9d3b6dfb7712c36aa9a07dad1ef2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js": [
-   "7e5feae6827743f777110384acb796fda063f079",
+   "1616833ebb94735b035218298772e6ff4c88ccc7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html": [
-   "45695ebc7d9a9bff23a0abc248742b34242e9d8f",
+   "07acaa86eb27fcfe02f82c001cf84b20c90d5f50",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js": [
-   "90734bccd8dbd36b5cccea4ab10155186f871c1f",
+   "c6f921737ff785a8a2fb39c6dc6cddf8c8983b4b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.html": [
-   "f6dfa64b6c500504d2c60fb7cb9bb469278995d7",
+   "3f80ca99d9815e769a689ab16a66dcd657e857cc",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js": [
-   "6221b4fc8ffc30a4b2eb95cc3b3b883f4a3d8e88",
+   "5146441968ee02f6625cfdf4a4c3d0f991afdf50",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.html": [
-   "9ca390af876bff678a08353c3701058599c3fc37",
+   "4a83b26c34ba92d88226241dfd41a38f18bf00ab",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js": [
-   "d3113570dcded1c2037cebc4ab1d2f2a4742d140",
+   "385374c093cd6521fa2886b57db661ab673ce3cb",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.html": [
-   "ea27c0df94435804d9ac76002acdf56719f333fc",
+   "3682bba0f09e0c9a60d2140a89c0de8d9bdfdb04",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js": [
-   "c7eccfdbaf22de16ad0724d932e1ac05a05e9fa6",
+   "2fe1656ccd40d4dfd60e2aff6379d08ef5216028",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.html": [
-   "16d3c9659998eb1341a3fe3ced07823b865efd16",
+   "02d3ab1af615eef55055fa3d112ccb3d1ba2e0af",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js": [
-   "8f2d10087ee4e9d0029c7bbcea9aba1cbe027445",
+   "5f6e185a24982c4c09e8da47f34e9b16df206091",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.html": [
-   "ea5863e5425f6546d9c97abba8b22eb8c654ed35",
+   "5abaddf168c235b54b9ef48cd1842a15430855a3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js": [
-   "ae236d34abf200999383e3b849cd465dc555e150",
+   "96313cfea0c948d9cb156a08cb8dd083ae676f10",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html": [
-   "70b5d19bf123738ba8ade33457b6b0718781a49a",
+   "39cacb901e6b9dd57c583a898a6fd6e4cb691be9",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js": [
-   "7a662468be3c8bc641cba50918d39c03299ea827",
+   "979e020796b248b86c59632aefc134e6f72c1de1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html": [
-   "026a4ebfbf582d96ae050184be90b9e97b87d587",
+   "ce657dec4c2573cba52f1ab2ef5c886ff625c603",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js": [
-   "09458c628daf4f13540efda98c6ef0f220eee713",
+   "6a2d6e0eb04973cd4e80c288b5ce39228bd32653",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.html": [
-   "c1b8a784bdac84d92cce487f12912a14f9ac53e8",
+   "295b985a720b61f454991167f1fd1493a99a60e5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js": [
-   "658438fd0dba387864efee35d20604845bef5ca8",
+   "4589b0c52e649a3fe9acc2b3243346ac4fc0553c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.html": [
-   "086bce9af93c0376d728a8be501489b2d4fb8709",
+   "363618361b3918a68b80a6568189bd77043210b1",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js": [
-   "11d7cdd5d58a737aa02f3002b9e58775ad05ecbf",
+   "90f9e66553fbdfae322598a052967027195fb787",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.html": [
-   "0884d5e2c3df5e9cc0db6935064477d9020c12f0",
+   "0b25145518d742bb695f8f8850bd1b8bb67a8ad9",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js": [
-   "2bc5d12117a50b20965a3d7c01f56556fbfde169",
+   "401d46f7a15632d6bc6196c248717df89d0829ab",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.html": [
-   "7af332cb22ad08bc7fd53f55235924bdc4dc3c92",
+   "e0919975da94b53b3cba5c1e817642cefe2e4a6a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js": [
-   "97326018fb62f1d2b3fd7ed111639f9e025e3150",
+   "c55f61a5aee13d615a2589254932961df31ae923",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.html": [
-   "3fea8066889fade6589dcb44ee78761ff0ff9e2f",
+   "546f35433a0e9d50594ddc597dafc5f644f761f6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js": [
-   "b45aa46ac02597f6e911cc28cb1a39bd229ff1b1",
+   "870f8c4ccc324441baa584880cda2522fc8a19fd",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.html": [
-   "86caf07ae83f7c7f6468a3bd58db615d703ca9ab",
+   "943b44416f002a77d63f000c4de41dd5c69388fd",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js": [
-   "92e7f6f1e13066c22f82981f8d267c2161f8470c",
+   "0c4ee83e28aaf7e2ea5b6a9ef13f80e51564cc54",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.html": [
-   "d0bf2dfb8982242e521de6ed98b04b02c7a2a9e0",
+   "e946b89d917d6db1dc1a09df434f2e07742c9037",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js": [
-   "5bed45d536598e90e40f0697002d0331a1ab1998",
+   "1c6320a5e0075f9d8bb8d4ddabfd420db41e5244",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.html": [
-   "174d248c170571321b4e63385b40177ece6c8e67",
+   "c1cd3e00900a624c37262ce82156589585fb5637",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js": [
-   "83ac31c83bd44f7ce7de8d576a5f0253d3ac4756",
+   "99da8745227f43a0c0655eeff32072ac27127224",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.html": [
-   "546779939236b804a626c5b884197bd833ce578c",
+   "348b8b60674b4a3a724d7a7d0cb4536b533144cd",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js": [
-   "65446044bd9a07c439a3bfc78a65b44b075e10a4",
+   "4a8fb0e01c6f7ce127ef1dd91116cb26a017fea6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.html": [
-   "b0a4e67077d3fe82457746db837c6df88ae7d122",
+   "91ee26442f99f860d5e04b20a2d34a8b92cfa945",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js": [
-   "86d0a05e5a6bd10f3176befc9d0487c5c7daa730",
+   "b8366536ae5cb8de5c20e70e1377589d10e7d50f",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html": [
-   "4dd6fb470182141155fb4505f7051784eaa81365",
+   "1e0585ec104e89885bb86fb384497efac19e8a74",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js": [
-   "fe6af5ded07da673ffd83d94dab5674758639640",
+   "adf6b7d580253f9a499bfa6fbd474ebeb9e81e34",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.html": [
-   "efe2345a0598584088efb2e91b918bf741329819",
+   "075470f0a01bd3276a5afe344f25b56fdb09fbee",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js": [
-   "d35d186fef9cc7bbc6890e529ce99ff6741828b0",
+   "31add065ac2671455877463d572192bfbc6386dd",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html": [
-   "9a91555e36f474fe796b5ac8b222b83824ec74f9",
+   "2293d21bf7b700ca95aebe1b158fa676c86a6c16",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js": [
-   "bd8b9b8dc5a4615c7b7cef0c77de873916826bf4",
+   "c015002c6ada142efd66e6c0d9f75876cb46b13a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html": [
-   "bcf987ffd5f94db189664a890559317935843216",
+   "d3c8cd636b4baa840195c21fa4e3c17154d363e9",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js": [
-   "56f5d3de9682796797bf3aee1e1cc403caefd3e1",
+   "f660f213d6ae3d44bff95c0dc069e3dc25017102",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.html": [
-   "220962579e3009821811653ebc8ebdba84f16d4b",
+   "193bb9dd4c01b3c3de71a023435591237f6bcf63",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.worker.js": [
-   "a3186103315cc1440c3f2f6617730c79651043e4",
+   "6b5ad64c7c4652f0d39b6543240c05f9806a1746",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.html": [
-   "17a39e55ab3c55b99c6c02e09faf4a46fa119241",
+   "0722f8f28173f5e953c684a14fcb1644e5f63248",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.worker.js": [
-   "a90aed85b7303bcc317adc67f822224d70dac7d1",
+   "c64f978c3fa9d76f7b2a9b9fe8b17d1778da6911",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.html": [
-   "5fbae270431b1470455bb6e47fa76680c0f3d89c",
+   "8dff948281390082f2f718b92ec715be90613462",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js": [
-   "edd855997a3049bc7b501c6c5efbacf3be5acf02",
+   "52163c091c50c508708c894cb9cd47a481f980e5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.html": [
-   "52a3f25c20ed619cef33425275b88ab93132ea05",
+   "632c5aefc8b996f3ff4eba1e4cc7e1666b4c0b86",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js": [
-   "81d8635e65e7a5867ca5c4ab947cdaa88fe4f8b3",
+   "841a9802c1b6332d5f2d4b361814c1cc435fcedc",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.html": [
-   "6311a22d58f3e4ec122df62c54aa90ee066fba0c",
+   "f1f268551be1e38f92458a7d55c3714110c79b57",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js": [
-   "b7aa138d0c3f946fdb2ec5f9d69488a622a4287e",
+   "31d7462aaa45cfa96dff1587e3836a9a104556fa",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html": [
-   "7fbac72795768402a143c0b0445ecea8b667c320",
+   "ea5adcc8fe4b934bee37082f70a3c837c7b72575",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js": [
-   "318278b5ba5f30f0c501e78fa6ab2e3285696fca",
+   "042f0c61a715bf1c4b8be0e04b88bba89c45ff48",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html": [
-   "764ffb8f891dccb5854becfdbae614b826ae34ec",
+   "8fcab2b0c9ab3d6fb017e66311460dd242be544b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js": [
-   "c43d90c57b68b1e7ac8a9e53d809a0ac07832897",
+   "fae7427b58d120c745870c817b4facdb4912fe25",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html": [
-   "ed66d9dce1f6973a33450fcb01521014b554ce52",
+   "191f0bde3e189b9ac511ae4ab1900174dbff136b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js": [
-   "5246a21a13d709e467564987e999b98bdf02896d",
+   "5c6c5c1c21e3fcb091df9234a14334500c9698b6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html": [
-   "64fba24e2d82e8df6d9c84b0ad2a3de1be7326d6",
+   "966fac841238aa0a01248736b025c4d96ad588fc",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js": [
-   "ab2d34dc3a4a5a1e86ab4f424e66db3bf27973b6",
+   "8cc326b733ac8175e1ea234029d5a58721de1657",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html": [
-   "b118ae25754d74ff08217bd8d7d1d62682d92fd4",
+   "7fbee4db8babecaf16a63c1e41263ae03ce71ff2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js": [
-   "ee4e62d7074d7c26e95ba48267540a26923a46d7",
+   "85594b6370eb85db023419c7df4c1695e72048f3",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html": [
-   "66d01057847a3a83e94d486f871d95acfec0bd77",
+   "8ff07ad8e9131983ce67147a00c5a96cb45e9b3b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js": [
-   "bb51634b9c34f0e83ea8f59c14dc87e7edf7b984",
+   "d017f08306f2bf31321fbcc41a501142c99107c2",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html": [
-   "326e6ae25df4dfa373322d53db01c5f317e0d3f4",
+   "02ffc97632e521144b82c9a76990a0ff8b1ec859",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js": [
-   "62ec6d050c3c5280dbacb00b5b07db9af7a4a014",
+   "e365dd6bbec9fc0d92557756794d99ca88acbae5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html": [
-   "13cb9d0ced670ace72885773fd37e0d8caeb3ef4",
+   "8149d8938ea2b11a9a7aae8887b149b46cc0be3b",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js": [
-   "4ccd01125f32ff63d478fe940c853c07882c8528",
+   "d6bad4c2240e30198424fc75c1e54aa345ea1393",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html": [
-   "15c9d0ef9340c9e0a0e80608877194a12354a424",
+   "63d30dba51ed1ca77311e5e7b19b1b74c3b63235",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js": [
-   "ab1e2f1eabf709d5dd992ec62d17dfd029425ce6",
+   "b31ebcb665642f147d240d0910fe5356330a9394",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html": [
-   "7cbecfb8c88ee37acad361c95d4a605587b20bf9",
+   "404a51d727b90dc32bff93a2f12ec25d4d6f2344",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js": [
-   "c6c9adec7761daf17b904244f300582c82fefb1c",
+   "3ab6b4068af3de97218afc4954e11eecb38517ea",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html": [
-   "e8e61d904a5ebce69b50c479f06923ac5de438e5",
+   "70028f7b9fbf2a5d3c8c2566d2b2635b737e55ac",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js": [
-   "c5049b8183bd0b3ecee8d19c1290ed65c92c9b0a",
+   "3ae9dc9a7aa98993df946f57aeea609d196b22df",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html": [
-   "a2898cd27a6d903345f6eb87841a26f58d1a7a9d",
+   "7af8e2dfe19b71056ebd2832c8b3eb155989b62c",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js": [
-   "65d898b6818a237761c5e6860b65f177937df72b",
+   "3db708229dd930f0388b8f009c8c2a95c4a6542d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html": [
-   "e414aa6dcc1ec05d37b81ad4718b94f8df054a51",
+   "45e36a403ca9a84d329081ff062de138b3a06a93",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js": [
-   "19b9c27f4f189a96c3dcfc209dd24442c0eaa434",
+   "209427ea824be71c82098da9671f121b313fbcb4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html": [
-   "fd94c1fa7f88ed25ce0d3d5e4bc35c13ebd44250",
+   "7818db33ec304467d4c96473c1395febf30eba61",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js": [
-   "eb63bc1439f04e2571b44ffd000d530a9f98f31d",
+   "080887b105138813674613b72f4d8cf95d1bd70d",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html": [
-   "ffeccd2564814eeaf8ab221c1499ae39374eb4e6",
+   "f2fcaac9cbf7091e39f4c766674854341a56ebc4",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js": [
-   "af445ade40ef01202c244c7f4b9ae39ea9225ed5",
+   "6c43646e1e9bfae724ad4ac90d88e97887f07c72",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html": [
-   "b0dc7df7c592b0e7962fc677c3119a891c325377",
+   "813f7f3a581abca6ecc753fb2c95f47318b38142",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js": [
-   "d1f8b5fa0d67264c3c3b931b03cc84536b2c5b1c",
+   "d9f53a00eb414a6693e0d94dd10796a4723e4375",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html": [
-   "a4f58fb71d9bff2d505aa8637b42168b2fdd8a1c",
+   "6102405784f0d252148f0df1988f72db74705c33",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js": [
-   "359d079c043a8cc7a93de87e6b9b0f89f354f34f",
+   "92c39e2f967b75c7a8cf62385b3df256b9663337",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html": [
-   "fd8c2be188f287e6908ad53ddc934dba879b03bf",
+   "67c4061c753af15266fd79c48145727b2da55975",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js": [
-   "7f73ae25e480e52f1e77c176c6ea5d92b5ae1d01",
+   "dd6d243ba5a46b44c5af47907532e03e66d8ff21",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.html": [
-   "59763aa39ea817965a4acf9469051923dbda2918",
+   "392dfb66e91fc29784472a70d69ced1902236bd8",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js": [
-   "44838d970c05f21d1e6a00339acf8140f435fa24",
+   "1f7557e483f0168a272e36073d160a58b21f40ba",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html": [
-   "657221124e25f69c767994ccbfec415ebe43ea9a",
+   "426c069a446ca4337e100884c2bad2e681f96cb7",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js": [
-   "7a387f2a0b7c2bd0b5305951cd28c9f7475372bd",
+   "5338663f9f5e33b8d51e6a4a0d0562bbef1acae6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.html": [
-   "e36a278a30866a1038f3a0ca2e06b2d816518519",
+   "246dc0a4eab5deb558022d895338923c543e0bb5",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js": [
-   "9c96eaee202b4fa472b1833074ad953fefc37e9f",
+   "5c65bfb39f18d1e7bf978b784638cea4d87d56c6",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html": [
-   "6d5db664c77a7a27866d8ad2ca5f7d8bfa0d9d33",
+   "4b0f25afbf9369efa5560e48c00e706ffd679e02",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js": [
-   "18953ea1118321b276cb5a583cadca37cf5842e1",
+   "3288e128257b9d3e963a0a41687634061c54548a",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.html": [
-   "656f93ff055bb65e634cfaa7e4cc2b2fb2442a27",
+   "0722ae5ddc949fa7484d18ff4752a41f959dc197",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js": [
-   "3cd4d8dcb5071e303bcc4eb65196cce898235c8e",
+   "020adf7c0026e3ff8fb051863a8a716a9557c0cb",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html": [
-   "ac3a258641b3fbb7705cfeef3a3b821af2a9492b",
+   "03f4659fd7768ffc7e1cc2f0b0d31bcb6e5e17db",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js": [
-   "1481c839f0a03dfad75399e228aa62b496ec78c1",
+   "2d7796d0ae38ec6a0e77ccc8b8d02696d87a6558",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html": [
-   "3004efe1ca0d08ac19ab7b0720457d02138f1f03",
+   "5d5b70536c4db560e832edf6469f38ce3b3d5300",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js": [
-   "c55c6212f5f39a261ee49446fe2f7eef0a1a3a48",
+   "d16979b6e98ead15119e554c796557cad6fd2a87",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html": [
-   "1c350ba3810497c28f8bbccebf38589a29f2b8da",
+   "a05008ed851128695e9d054329c1fbefe61a1754",
    "testharness"
   ],
   "offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js": [
-   "803c7002dc8fe094174cc740f8f86eed35ac0b34",
+   "399e9dda70a90d39d0d045df53da64838f8f85e7",
    "testharness"
   ],
   "offscreen-canvas/filter/offscreencanvas.filter.html": [
@@ -676436,2331 +676720,2331 @@
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.butt.html": [
-   "eb85e108b4cb3018ae1942edfd10e9ee6016f7c5",
+   "fc108c0de491fa7e05f65f72a6baa9c771084bb7",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.butt.worker.js": [
-   "82bf9abaaa8d85d7164703edf5ce1dfd43c10854",
+   "13020adb08756ff0694bbd8baa4c303cda95a2ce",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.closed.html": [
-   "4124a7e703412b93e79c729ff33a19db8353d40f",
+   "67fc358b0436bcffd27320a3372513a37a2b7565",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.closed.worker.js": [
-   "358aacdc499273732f85169c8165dfe7c55f93f4",
+   "b4cfe501808ace9663e2dc24e5f0ba28337cc9c0",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.invalid.html": [
-   "5ccad43d42e1e1549626a886b3ffa67cc3ec01f2",
+   "b8499fca056bcb172da5ae63d57c2689ceb870ff",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js": [
-   "274ef707f88b8b14d25649ad530483da476627ba",
+   "46046d416112caced35749c3c32e9b9ed42478a0",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.open.html": [
-   "fdd7c6920a86cd80b61808517a8bb6244894b246",
+   "154aaf752071b83bff63b86eb4aa5b6877909165",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.open.worker.js": [
-   "19a4375b4d6735cd99ce04d58363afc74e891715",
+   "e671b55d06d3d2a929d19fe50a776ee0bb2a3870",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.round.html": [
-   "97ac28e50a7eaf6e77f62907a21abc5477444ec0",
+   "5fc90198e88c0c1e1a9639e0a6310fe64a80099a",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.round.worker.js": [
-   "dda047cf44c918026c3661f53f03ead5e3b9e4b1",
+   "38faae623fa685a4864161a07fe8c8a32174ab8f",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.square.html": [
-   "6b3b28194a1c02116787b0346426a5d6bb9d8439",
+   "8cd09c683fad3415c86dcaf08fed0385a8ce1f6c",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.square.worker.js": [
-   "65031f957463f08eea3e257c651d75201d2f989e",
+   "aeac1e3c04f2e77f61f867ed53735f67f887ae2f",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.valid.html": [
-   "9e56b36816fdd0ed8e5d90329e37d454952b5a34",
+   "9d4548767ae58eb8c94f5f9200677810f1809ab3",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cap.valid.worker.js": [
-   "3fb104378d6a3409d3c086d76c3caa691b9c168b",
+   "da84eb91dfed2cb8dbb9f58794388557878999fb",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cross.html": [
-   "264f309e8497d87b832b04315a16a636ebb72a14",
+   "747787c7ba375e9a8297a86275a51c811da538dd",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.cross.worker.js": [
-   "599edc45915c634c7c3077b821252e607e3a4f03",
+   "2c8e68bfbd1a4fe4c6a381819434bab760db3978",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.defaults.html": [
-   "6eaebbcc05dfb9f99c4ef238603efa45c5afbf00",
+   "1051d99609d6957ecb28b946e3ba16aab253f02e",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.defaults.worker.js": [
-   "ce8f4bb73cabab410daace31f63e39e20cd68571",
+   "e904d39112dd67549e1f65209683814af8ab8e1a",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.bevel.html": [
-   "ebb24aeba14c38ef70b6d543c60534abf8309058",
+   "0e4dd13bf4d445becbc1c282c270e851ccba769e",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.bevel.worker.js": [
-   "ee1e7f3eae216fbf4a4ac39213c6142ed06d8975",
+   "d68b4911ac5319a9190d85d5b7ed1e7227ff3e98",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.closed.html": [
-   "9c79d92ec26a93f0b2a014aa20ac6c4d87605eb7",
+   "ba92b4c53fe6feb5ce39d4f9a2120a95fad03325",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.closed.worker.js": [
-   "299527e410eb5ed6b0ae2fc389f2fd79d7077085",
+   "fab1c63ece537ea9a59ec0662d02809f764ef656",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.invalid.html": [
-   "6d838d74e2c3b4edc9d27e9cc2f9e169863221cf",
+   "0d07bfa68ca1c038360b9298e3e713a1d45b2210",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.invalid.worker.js": [
-   "7b55609c5a4a4c8381ac5fd34ebef45aa30faa9a",
+   "04863e5f0dcafe5f52b66be0ae0c0cd78e135261",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.miter.html": [
-   "12575cdf6beeba0f72ff52ed5708cd7ef5e6b7ca",
+   "45eb47cf311ec2e57d2eef07de219e39eb4875aa",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.miter.worker.js": [
-   "541481416a86187f8e7b638309a44436edff1aea",
+   "1707301d1369621043f72e0505b081f64b1ad1b3",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.open.html": [
-   "83c3c8d51602bd9a72fdc42e439f82a650cde552",
+   "1941b1abf5843445363a291e7fa9050d30de62b6",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.open.worker.js": [
-   "88c3453cf152e215b3884f3622be58fce2d704c9",
+   "3cad74e9ea3c50c06b547f3259fabfc3de03110f",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.parallel.html": [
-   "e84246bca00e69e285e80c02b62cf78565786aa5",
+   "dc7c8c2bd645b74cb5948df685d31e570f310633",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.parallel.worker.js": [
-   "ef79c187e2baf37a6cf5234a7127fdc2c4bf1b9e",
+   "49cda7613e1a6ff6763f6d4bb9ebe28c8a61a0be",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.round.html": [
-   "5a4085c92cdd9cada0a6cf539d97817dad673912",
+   "54a9ef280f761c4d27e50f2c4e69773c5078fd6d",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.round.worker.js": [
-   "e7e8f5b0a636bf6d2a689ca666f0fb39a3ef0935",
+   "cce888ce94687818953d8b47ff2b2731609c559b",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.valid.html": [
-   "28b61341bae271c0888d26d3f0f1c0c47b4418ee",
+   "737eb4864149d69d471438b80dd17369b0807b62",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.join.valid.worker.js": [
-   "88c61f0bcff6811e71937e7560764774c1e5f5fd",
+   "78f0a4559a4966577e23dee8184933b2943b00ea",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.acute.html": [
-   "a457458596696a1664b13bdc950b66986d442fde",
+   "14a65ea46e3af5253ba57fc00288980bccb01a77",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.acute.worker.js": [
-   "db332942293325546851364e85913c88f8f925b8",
+   "085a4f07c44e6eb3d03fbf3016b64b16bf393fb3",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.exceeded.html": [
-   "c3f94aa13f476de8f7cf06a73da0f0f6ce4b6fc5",
+   "89eb50918cbfb19221ec7fecb8a4fd34dd164369",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.exceeded.worker.js": [
-   "b8c4d737f2ca4ee088d81efe0ef939b47da27175",
+   "3fce7b853ddccdae4ec65ed6207c0070fa9ed5b5",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.invalid.html": [
-   "727ed9bf46b20e12bedb349f60bc0828cddf2ab9",
+   "c7cbd823448dd83885b2675af1db0d3c034ad3dc",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js": [
-   "60a62187086be7a32358c5fae0445e72d55c4f7a",
+   "bd05e5775c0f4722ead5f3646e9bdd401014391a",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.lineedge.html": [
-   "8a5d06542c7c5f394d0d3242310f4dc4d4522262",
+   "f509c5bae66c3a85375b6522d06354e5c017daf1",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.lineedge.worker.js": [
-   "ce7c35deb9331a15bd3c38e382dc3c0c4f61fad0",
+   "d04fa39e416ef3f62ff4cad3e4f60350c8bf6a0a",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.obtuse.html": [
-   "8205c9d1bb2d0568e5d122b0a079152eb380e078",
+   "6e440a9cde1d316fde0bc8cddd895e1fb9eddb12",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.obtuse.worker.js": [
-   "7aeabe5899c90733601115b4146ae5ed4c577751",
+   "50c22af4dc7a4f089dddedc5fe51386a1640e15d",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.rightangle.html": [
-   "2562685830bcf9a867971fc13053ba83ffa64ad1",
+   "6e2a96bbe5421eae546082d6543d75eac75ed54b",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.rightangle.worker.js": [
-   "0e532f68afe6690bc88a5a7f00946cfe8c9c44af",
+   "36e25fb22b8ace6f0c7bef77b20b033e7db33d49",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.valid.html": [
-   "f814fa3240f6ab3c9749678a5ea00a694f42a2e7",
+   "c0e6ee2beb9469c887b8c080186fdb2ba7c204fa",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.valid.worker.js": [
-   "b6cb6ef83ee821c0c1825e9dae2fd65f287b7a2a",
+   "992d37d21ae09686244fea8c3523dbec821e5ccb",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.within.html": [
-   "ec8128165653fe117a98be0e93d536223b90d5db",
+   "b8e0ae21ffbdcd766cd02554010e87d123976ccd",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.miter.within.worker.js": [
-   "811b042a8bec5bbaa71ac50662a64d7e7f83da8f",
+   "202c4ef573106b0ec3a6275694f6b2876b96ba83",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.union.html": [
-   "b7a725c58a856f38bb51c972ac6c90015670f74f",
+   "178527c52b8799e8439123ea0eda41bb8ad18fc5",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.union.worker.js": [
-   "104c04c3caa4f78f0acd2909e99d5164435cd8e1",
+   "43ce6b7d068b5c8552f7f329cd6138f84d9531f6",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.basic.html": [
-   "6a733304d2ee70a3c8bb7d2b42969489b3f1ff36",
+   "b6b90a1200b317bcdc9ced866bca21c194276e5e",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.basic.worker.js": [
-   "766da43977b7fed6f5e1b5af704888d41491867f",
+   "f3120b6b58668ed452ae2d4cee5b1e468bb712f2",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.invalid.html": [
-   "f2160fa0920baf3607d5553bcf09d1c5aa694090",
+   "6c609142f0885f8ee0c9a8941e8e6d3a9038bd42",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.invalid.worker.js": [
-   "3789b20e0c9417806b0ebf6333ad72a471b40cb2",
+   "37e270734a6f15d8fc4b78dbf0f34626227d6ab5",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.scaledefault.html": [
-   "0767c85619456edc258b6a8b202b621d5711b45c",
+   "e2e36c8c6d412468d1c559dc930af17655ce8824",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.scaledefault.worker.js": [
-   "a2891a74e6e4d43e4a6b0d15ddc706d35037b215",
+   "cff69302ab8624bc2d657392fcea416f52264869",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.transformed.html": [
-   "4553f4b543d336b45c7362b738f23cdae207ecd7",
+   "e99770d1790b77f7fb200a1b6f671059903c3eda",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.transformed.worker.js": [
-   "72e13e257cbf188b139907bb4a830deebb240d0f",
+   "cbdca37ad3109aff740295f8676d57970e8ab7fd",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.valid.html": [
-   "748aaaa6012c29eb71a891f5bff4bf73e1cbb56e",
+   "89a96ab2781c203bece1e58ec980c2c2d889cba1",
    "testharness"
   ],
   "offscreen-canvas/line-styles/2d.line.width.valid.worker.js": [
-   "4a8680dbe4f2b15ac0590823a5ba4cf25513b933",
+   "7fa7fe5075ab50e75ebe55ced4ddd9dc7aab2aa8",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.1.html": [
-   "56c147b9de22d21463684a866ea926fa9ab115c0",
+   "000fb5535dc228429c246c2cdfe68645e04c9eeb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.1.worker.js": [
-   "a0ac90e470ede80028d35bafbc48a2fd9a37318d",
+   "da057ed37829aa9957f512c283ae3b735de640c9",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.2.html": [
-   "3c108aaac24556957dd45c6dc1b1995926cc1dfd",
+   "9a9c6cd20d8de568886a36513b49a078e877514e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.2.worker.js": [
-   "eff7e0fe8dd196ecf18097e3d2b53f6479086383",
+   "f1b07ead5da2d0fcb4739eede9947ff85b46c866",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.3.html": [
-   "31f1c1cb97dde5d2f960a5692c8ab713c2ef1f5e",
+   "f06d700a6fdd8117095b50a23092567d1de376df",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.3.worker.js": [
-   "1a6354034e6934ba9b456ab8160bd92c6d10d1b4",
+   "0ea67c58e40da99b79621bac8ab1a56b5e14cad2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.4.html": [
-   "052c12163f224840d8bc082dc2e29ccc290917f2",
+   "b076c59c54deac67d79f0cdcf9974c487374b80f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.4.worker.js": [
-   "1d5b3cad502f7d066e6b47f059ba84878501bde9",
+   "c6d19c60c02e6e402d2ccd6f2601f661a8c72080",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.5.html": [
-   "c8c9a8eada5566ffecf5234ad1bde6848c1d3f6b",
+   "486931f03e3cbd45385f53f1d79ee886c9f3339e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.5.worker.js": [
-   "caed42b22cf003a68a6d3e5e43387ff9a58ae1f7",
+   "dc3200d23aa6bf0ec29118e0625904f87fe10686",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.6.html": [
-   "52f37a9b76ca5aab366a3ab20aef42d6e8f971f6",
+   "7eb466af4be0bcad53b0f225ba36965a380521f6",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.angle.6.worker.js": [
-   "8e8f6aff5e00babaad441977114898e285c8d3fe",
+   "486027e2e4164d374f778a1a5e50c8e0104d62fc",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.default.html": [
-   "ec5f63360443f56cef9193def7c78c6ac75952c8",
+   "ed27040896e04fba232ed6985022fa7046519e1f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.default.worker.js": [
-   "48cb110d0671d596bf8861f7bd50b2b910eecf2c",
+   "0eaf8bac6dbddb30b267ec5cc3f4e949e8ad4694",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.empty.html": [
-   "1974a0aed58baf304ff791c704b16b1edf593ac2",
+   "99b43e07c459e58e54d7f25e1ac8fa27463a2931",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.empty.worker.js": [
-   "70a8aa2219595202cb819bca95bc1ed90fb7c76e",
+   "bdad777980799ae4d38e28da8b17a1b9db398b88",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.end.html": [
-   "6d4e8deb44ba3dd11d695e08f2c4d3062d1970ac",
+   "2a908af077e8fbd25e23521f15bbb854300bdbe3",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.end.worker.js": [
-   "47c6e4f4fb137baf8cf7eec8ac8d9316357e4e6c",
+   "edbb7324997e0bf6507d839a8197681d68af1173",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.negative.html": [
-   "5510124d391b5527eb66971e8cda5d614d2a0bc2",
+   "38b7b8679eae84e7b4472817d1a570b6f5156ea2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.negative.worker.js": [
-   "7247a42922940e8995bf5c04f5fd605e3cdbd948",
+   "e8488a0abba23e181bf2ba6a104f981884363d04",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.nonempty.html": [
-   "c6acfa94f7770307c5b4382ac24c74f86ef9d0aa",
+   "0f892d8692fe1b4eae6e56bf557814e9431c92d0",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.nonempty.worker.js": [
-   "64bda0d3d48d2eadcb990e8e1254273763ac65cd",
+   "02dcd7b8bd6ea8dcd6559557204e6cc9d33b384d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.nonfinite.html": [
-   "2ed6dcefa8360cb1f6c6482197b16af56a2b878d",
+   "28e4a8d3765bfd6b6c84520d6bd9f7cb54ce1597",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.nonfinite.worker.js": [
-   "50bb057f93c11433d1aa9a755c5094ace2f8b869",
+   "ce3f82a02282f884730f22536740f76a88900094",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.scale.1.html": [
-   "e46c7fa6302724a0818f1f6ce94be1464798a771",
+   "6e973c348efa9b8d1f8438a00d840b6360c61a2f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.scale.1.worker.js": [
-   "d2f67d51f040be2356b328c4161e742495135b4e",
+   "27ed844a9ef293ccb4a139d3717d6fe538c32490",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.scale.2.html": [
-   "57eaffd3db44397d32b08b8c5910ed0a2ec24684",
+   "8e57b0c6b0c9fda4bf1a6c0a7f7f9c1de1d2b960",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.scale.2.worker.js": [
-   "f99db078a08d8efda83db8ed5f03dea8b0b4f2b7",
+   "8cb14eb94c12e849aaa3c2d1e0d0f9e59e85985e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.html": [
-   "fa22b54e8ebf60a29a581ee84590f180289a9892",
+   "95bd87a22028a0b5da5ac6aa0010656aa9224c57",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.worker.js": [
-   "c252201a221bbd7e746e730dc9142dd534768725",
+   "2b2b476b5970a75e8c9abab0fe356208015605b4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.html": [
-   "4f784d009e926e3e30ee0b62b491ef3f4bd48f34",
+   "857b7c105d437a947402159e276448121a78439a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.worker.js": [
-   "ece76ae631c0666eda0d35a1f3ae49c4534bbae7",
+   "b2eb3e307010f79d44a63f23962d8e68561bee79",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.1.html": [
-   "0e093207ad4ba094f1df32708a7a2805c5585d89",
+   "4a5041a9046b3f66f416d6db74433b21c769cb2b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.1.worker.js": [
-   "b8cce2e805a8320163a2530eab2aff09118d88ed",
+   "45bf3b1def37983ca4d9211c3fd346f8d6217118",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.2.html": [
-   "65f08288f26357f182fa316fe677046b037c283f",
+   "42fa408b4142bf28fee31aaa0ec1faf8e36ae8f1",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.2.worker.js": [
-   "57101128cdb6558d6842ba32ca05e59adefc88ef",
+   "5e895320eb58dd1d044d37ad52c8749f657fbf57",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.3.html": [
-   "39964ad38aa66fc0fd0867beb3b6d8af93364ca8",
+   "dd51da10239ad4483fba065615d75667b32c2507",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.3.worker.js": [
-   "865d323e00687096864aa80882e7f39bc37bc977",
+   "583cf6dad87cdb639c3af4893c4ebc35c70bb10f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.4.html": [
-   "4f4ad644533d6528487b59cb1a471ff469779087",
+   "a66ad11bb800408600e7a29657707148b170d71e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.4.worker.js": [
-   "4cd21988853457b8db4412c2140d26fd73d94921",
+   "5f86f2c023cd817a615ef9645faa665d21eaf590",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.5.html": [
-   "e0498710ab67280ce86e531dcc653bba96ab30e2",
+   "a4a9dcfd211cbcfd564041362f1b9bc628d139d5",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.shape.5.worker.js": [
-   "e51809bf974cee9e63d183ad81faa741f9c53b21",
+   "2c77be6449ee8d02fc77e8218f029dc4ce3e0a1d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.1.html": [
-   "d9ee756d6318f28175640e6ff268f8af3d986f70",
+   "40bb5764ac467299d286bf54faa0b452c7993b7a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.1.worker.js": [
-   "0d3d5e3ae86dae905f04024e9ad472a07d9a206d",
+   "c2852f387ad15a0a2685ad401c6640ed1cedbbc9",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.2.html": [
-   "ca156fc830e64c5338476f6342479473856e3d34",
+   "09014e7c7c02e9e38f3e958820298fc5397bd23e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.2.worker.js": [
-   "219a4e5ede934da16059e4a4630b27adc1849689",
+   "c07fd1ceb120a24c11e2e0b2d292f31d52758dd3",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.3.html": [
-   "19fc94193615e505695ea184bd6d149f89cadb93",
+   "2bc000877f40898fed16df8f7680fb37bcdd1987",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.3.worker.js": [
-   "7eb04e60a440946397a8f982681c989d5d38af2f",
+   "eecce05b8c443d176b83e0e5c65786c262b0d51d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.4.html": [
-   "9e5bd7507d806d7a7b09c93113ccf6bcdb5c741f",
+   "f5f05fc8a3d79f5f57e570a2eb0d164b85bd3b21",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.twopie.4.worker.js": [
-   "180973aae64fa8dd739596e4d80c7190d4cf36ec",
+   "618fd4265dace8c8b1b0bb85e51171d48a2d23b1",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.zero.1.html": [
-   "38f5634cd7141487d83dee70dc5811f6f1cb0cbf",
+   "bf77486efae4eb171e970cb9bd6e9f73a5256f47",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.zero.1.worker.js": [
-   "1e99bfd6adb74060b484aa3a6abef183b66b0f93",
+   "489c1e9506e2402afeb0b941fb58d6f2ccc32fc7",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.zero.2.html": [
-   "b5bc72d9c1d8598632b3c6b002079e82a041bffc",
+   "730e2f65c090911eecd247b9a4e178aa1c247aeb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.zero.2.worker.js": [
-   "21b1c9b2dd57de11cc8ea463f3be7a3c3d9409e9",
+   "dad25fbfee5b4a108b8b186869cb262b8ddf9b41",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.zeroradius.html": [
-   "99ea73b11938942a618139924f0588ee2b3f7ec2",
+   "c4953dfeef17c97549a286b4e3f4bd0a4a909fb0",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arc.zeroradius.worker.js": [
-   "324c79962c001b8d14fad8d2b7a4f7e0ba501c48",
+   "589880713ab396cf6412d800e4be62ab3a4de761",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.html": [
-   "9699be4b4a2eaa5d454513fed1f1c4013021e918",
+   "2082deeecfec5b5ac87412cb6a7c351849117837",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.worker.js": [
-   "a895be35f93059730eaba6bf3b17d7acd741f661",
+   "2408e14daa7007c07a024056535bcb90e7cc2a2a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.html": [
-   "65fd0f45015f1f104b9d352d99b52a6d21462973",
+   "cf64ae72ae38f8c578d563237fca4f8c1fe73d2f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.worker.js": [
-   "8b0a8c68d7ff6192155b148229ea217ef400423d",
+   "33c64624b299bec8bbe55973e1d4b08e309469bb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.html": [
-   "9b984b81f7c938b97edbfe137d7549dbf2fc33ee",
+   "1f81565e541cb423f241be188ca387614c2e181d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.worker.js": [
-   "2423836358cd6488e6cccb5f8a86bb02a709a3fc",
+   "71264aac159afbae2e25a40d346d9b038c8f9ef2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.html": [
-   "d23e3376d3ea310cc14ff2056a88461dbc1c2929",
+   "474795c2717e9138768516c6f69de3c45b69c29c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.worker.js": [
-   "8ec2f81b082c3b0ce1427458d739ff66368e525d",
+   "810d27cc5dade56da0dc2c40ccf6e129619cf922",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.html": [
-   "b7d7c750f621b831ab4821a96d97bdbe6ec0921c",
+   "b9a03add26dc519945a9cc5a6dbeed6882003c82",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.worker.js": [
-   "971c16cf704fe6cb0a7354f12e3edac735c72f5c",
+   "df899e80463470356fcfbb2d627f477517b7e9c7",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.html": [
-   "c885ed46e00961ba351d30c43de463b53a11edae",
+   "b4383188620f493f8e44c255a8c8e4526fc8c86f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js": [
-   "559fcbe37ea94555257f33523ac8d048df783e91",
+   "9a8ae057e6a3ebf313758878a9e3d512a9f9049f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.html": [
-   "8a153c06cbd080cd09f71b55b7d570afdef881f3",
+   "5b54bd29b6ecc7d39619fea9ab6649e3842f8fdf",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js": [
-   "38364cbe3414ea9f2dec0a169c54a3ae858cd5a2",
+   "c7f744081752661d782fd5102ccd795dcf36feac",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.negative.html": [
-   "7536b381cce831ada5f9ba7da35ed117dc9770cc",
+   "0bd6eb2dbb57a438fedf7984980800a5e63e6a0d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js": [
-   "47e6ce5de7def1b1b0f58debace3a0dfc9ad51cd",
+   "55ecf54c381bf56654f10a8accc0291b647f41db",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.html": [
-   "3fcd6dda7639ee005818a2e081bf0cd4135d28f4",
+   "437e805b0a9a6b3cab4eded209279c9336fdc78f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.worker.js": [
-   "231df914f695ae67ec3541cbd941863fba710ddc",
+   "c9aa6824c1068fa9eeba6317ea3998ad08fcf63f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.scale.html": [
-   "73a127b728b0ebbf3cec8d4d9c7f5d271b73628c",
+   "0c153bd02ee0384e45206acd971427ba67912fe5",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.scale.worker.js": [
-   "222402f407712bf0fc7cfaeb24ec2b9b5db549c8",
+   "deb2e75aa95cc51e20226874458869db3996f9e6",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.html": [
-   "dcd610a1136df379e3825f21c81fd24e877e2e1f",
+   "c1191b12f6040adc744500230f6fafa91a89b90f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.worker.js": [
-   "50c8f79d761b71790932dcf1c7b6e7331badf5e3",
+   "08c29112a56646a8f98ab2c5016bed3c35b27a29",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.html": [
-   "6b3a9ba0fd6370a0a6962b992b0a85d82c22cc59",
+   "f052a78985fef904c04d00c6ef0337356d439f31",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.worker.js": [
-   "f46fe456039038a4324b398282e85e7e79202009",
+   "4acb94a60b87a09e5e5b5a73d064ab49605b2bda",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.end.html": [
-   "d5e1793c5cd940fe8046fa2b4d6e5fdc8a66c43f",
+   "50296237edbe5cf0b077bfa537043d58245ccf56",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.end.worker.js": [
-   "e6685e3d455aac5589de413622b81c69e5f9c726",
+   "58c40704ec26f5065cbf5a17c035a80f86204dd4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.start.html": [
-   "6419097c7fdf34e6bbfabd7cf2c572c5d8fd328b",
+   "75a1e8cbfcaab72d1e6e50d53977c0126b2c3703",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.shape.start.worker.js": [
-   "480383287a9fd3f47a814b92b5ed5ff449e403d2",
+   "88d774b75f0cf4f2894a87aa7ab8293ca01f9b19",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.transformation.html": [
-   "d768d50775105763e0213dc7f881022a806a0b34",
+   "d5335e8f2791c3d7072aee435f2ddcfde61582b2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.transformation.worker.js": [
-   "909e4a0825df2413be7b063418775613c589577e",
+   "489e06f6a3c34dc602b0da689e0c87d42932abe8",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.zero.1.html": [
-   "b6079956f40d3cd2d1267dcc7460edef21998224",
+   "9e68e5cd470ccc02b7149f3743bbb018e4c73cbd",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.zero.1.worker.js": [
-   "a76f63807769572524c5de3df1135e8b3da6c997",
+   "d2b62388ec8a60c5c8f5b78575f38ab2e8072609",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.zero.2.html": [
-   "7fde228c5ff9fa71b5f277e52818d7cebb520b56",
+   "60418e77fad706b74f03e61e269cf2f78268d2e8",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.arcTo.zero.2.worker.js": [
-   "623d98a7e973ec81cb2491dc1b9d2a7d07da22d3",
+   "4174e308524fd65b68ce0f74f60ef240c2e8206c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.beginPath.html": [
-   "807d7b236ec58cc7c311dee1c106d2542c23fe95",
+   "be1adc30d1d1781c682555c6ec467d11abfd0372",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.beginPath.worker.js": [
-   "cd19472457fddcc173898e7024e36258947948e8",
+   "271b689bce5564328bc91dc8ac5445907d47751b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.html": [
-   "3c7bc765056bab5badb7a62e4644f85545955c70",
+   "56f098384c5b55f497fcb011dbb768022e7ad86f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.worker.js": [
-   "e9709d877ce8f4c7143dbd7706dcf3ff6682550a",
+   "56b0d7719159680ea9b3865c4325d363314553ab",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html": [
-   "b3bf82f2768e16c9fcea48c464c55251cd2ad671",
+   "0464bbd49f11a70a7ad280d4443b7726b16e9b8b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js": [
-   "293a4a1978b75c09c82c6d11ef374888218e8435",
+   "e1bcf81ce4dfafffcf17ee69ca4589435b58ef67",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html": [
-   "825b574835cde2cff192fd99e0210d553a4d5ac2",
+   "dbe8cd2ac6150dcd36774bebadcbc6725bcc0ec4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js": [
-   "5ba0a488b2d9bf7897d0c976069e2bf406bd5439",
+   "2688d6b52ed613dbb261861f73394c7aa263d951",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.html": [
-   "3bf7e92db7a110a6dfdebbc221b3d98f6e430cbc",
+   "311390ed5b3805391728ef60e199fbc5cf90cda9",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js": [
-   "594716ea332d74584d74396105ff8caee2bd2c6f",
+   "c636f684cdfb20e53f99f9f867cea035c799e9aa",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.html": [
-   "8498357a75549754bb5b588fb900fa64a91aa53f",
+   "97614b2d4329293122415def48d62c6ad9f33b74",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.worker.js": [
-   "0092822deea9984627b6b908db0257b78b04fe73",
+   "a18da8419d198df30dbce6c08fc21f49464256f8",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.html": [
-   "632862f34765b5b686efebcaabbd265aa21f4793",
+   "1f93678911737f577cce6ecd3871c86309ad8b5b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.worker.js": [
-   "d3a58859a016a2f6ea7767a392e0dbb033f2458a",
+   "3ac23273185b4f1a425e410f001a72ac367a699d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.basic.1.html": [
-   "0e85dccc44a2a82793c84161fe99d96462301f38",
+   "7ce45202f85c1f3c37f06b65f69bf74ef23d1596",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.basic.1.worker.js": [
-   "9c890f980cc70ed9ecf8c1750c1f0138f8bf0ef1",
+   "557de1aa6e653d2b52fdca77bcc7aeb0c24e0d5e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.basic.2.html": [
-   "9f08113e3b9407d9962d1fd50626f2818923682f",
+   "3903a308ce7187ad66c6d1f9bf8aeb82964b67af",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.basic.2.worker.js": [
-   "40211c98389d7cc9b57694e5de0a94d09611f569",
+   "6003fc4a994c433dfc8937f29a606a91dd7c0418",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.empty.html": [
-   "e3c2fa7441ad816f42a5515b3c1628eded3aae47",
+   "78ee5229db0382880f655f6a11a5a01e0da8b01d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.empty.worker.js": [
-   "ec0a68795b41d820765764a9d9371e9ce82adf04",
+   "3148c75b5dad8e8130dba0baacf2ad74b7effb23",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.intersect.html": [
-   "0da3e708fcc0b1e68aac91bbe968fa457d3431d2",
+   "66e740439b6deadf2314e35bd91193bc85dad052",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.intersect.worker.js": [
-   "87dc1081b38979c374156da902fbcfefcfddb5b7",
+   "d8cb055c89e503a236c0fec46ff614929a5bb306",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.unaffected.html": [
-   "56af71667f42af62ae9941a04780b05905788840",
+   "4d10c2c002fa2b1b638a9dc89e70ee42528fda27",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.unaffected.worker.js": [
-   "6f68df5ffca81732860be15cf0fa31df865eb2bd",
+   "37375bcaf346c5be15a1c0845715a5b971c4fd8f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.winding.1.html": [
-   "0290361979bdfb8b35b4ebde0dca4fe136c8044f",
+   "4514dae71e2fb1b785110a040cf236643d03d38c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.winding.1.worker.js": [
-   "b1c0b0d5e11b9eb1ef01bb45b0e6baac9b189d7f",
+   "18512e0dcad806725af0ad8513f8eca474d089a3",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.winding.2.html": [
-   "34d6dd1128e9d643c9f3cef95a6bcc017e9c8b00",
+   "21cd63c94a9a5d78b28ed49042e3d0c651e3b6c7",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.clip.winding.2.worker.js": [
-   "4583717c952d30907062546fef6eee56dd9fb719",
+   "947d8ff44660d8907d1582057ea27eb711668979",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.closePath.empty.html": [
-   "6377c26d3ba88855e05fb628360b0c91f784ee50",
+   "2aa0ff3a044e8e2810c6f6a2105dd704a2e2e352",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.closePath.empty.worker.js": [
-   "86cc8d6dceb47b6b06299f49ddf46b3b475bdfe5",
+   "1d026f9bb63c6430a8fca61f0b9b299fb488d766",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.closePath.newline.html": [
-   "c37cce32ce75be704b6e1020d52ac1f810ca22fc",
+   "561a83bb6d1220fd1f4543dbcbfa70fbba43b588",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.closePath.newline.worker.js": [
-   "5012c5e30d0b1813b9f63f8fbce5a2e246b9b25f",
+   "b65ac8d3fdbdc04e32f2b4957cffa148d0d1a5e6",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.closePath.nextpoint.html": [
-   "0fae83d6137f3f2bacc3781732f59ddf58e5d1b9",
+   "57632f1ee03ca6a48088bf21988bb7df2dcf56aa",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.closePath.nextpoint.worker.js": [
-   "1f29f80b867ac3b0617a117ef7048668fee9f082",
+   "a2da49bd805b092384c2988039088bc3b89ae681",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.closed.basic.html": [
-   "efc4672f01b03660ce33ee20b6ed9e6c98821669",
+   "158d52880e73d50cb1116644816522f48c63785d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.closed.basic.worker.js": [
-   "5393baf5f0d24950de689622d0cf4ae890eb7875",
+   "7a1cc37dfde5219b2fbecb960e0102dbd7c618de",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.html": [
-   "48cadc50e8bceef258caee773ee5d9d2109b86b8",
+   "322c9173784dac045d8906f33cfd756aca8ae44f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.worker.js": [
-   "e3c43751d77105b115fb29dbb5b9ff7af1ddaaef",
+   "75ca87e6cc61f7714d30ab94669c62bd52ca1314",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.overlap.html": [
-   "5cd8e52e7d9edf0271a513704c55d7adeaeb283e",
+   "662bbbf13f58ab41c306121c29ce469205a50512",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.overlap.worker.js": [
-   "bad067478bb7520596c261f4484f29989a1147ac",
+   "fc16687b9d7fce303f5da5415b39a66e6a326047",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.add.html": [
-   "e98d10805ccefa03a58e3a31b2371c344b6433e8",
+   "e2724a1fda464132b2287e7613e10454c63230da",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.add.worker.js": [
-   "aaac3d73a3d1c2e9da818d676df941c04b6b560a",
+   "ee97157ea2667b987a42f0531a4cac6f613d2fd4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.html": [
-   "a6e93cd61aee979a08d3adab17848f6a46cbbd73",
+   "4dc44222bd3010f2ac14cb483b0f3bec2188f263",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.worker.js": [
-   "34f5a1f4d2b201e1c5e2adbf72bb3240f62080a4",
+   "558a35821dadb55752cc22ace696bf03818624d6",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.html": [
-   "dfb5c4ff2982db5736a72c489a588110db96079a",
+   "f4c375abf10259c9ea4f9df2187e0cbbb41156ac",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.worker.js": [
-   "5dda3143c1974820c8b5ee2795998462252bf11a",
+   "94b0a38d2b0ac2defe0d5906c5bde877c1c5c0ef",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.html": [
-   "3e4d65d59c782c70469f3a306f64859ab5102deb",
+   "c6bdf99bd46e28c2fe17121f6c09a21e379eaa6a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.worker.js": [
-   "a502d8de553adc4234f4e964001b4810acc5ae62",
+   "9127446d5b3e6b00830cb4ac0e0130e7d1365049",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.initial.html": [
-   "476b652c35274d4edb62804b213d689a3ba439b0",
+   "b9716ce56ff1ec112083d78c3207ddbbca4e83f0",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.initial.worker.js": [
-   "7ecf650f8f8ee01a09a8e31bcef7fc79a3711cac",
+   "438b771de486cd2d35c2360093fdb040230e9899",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html": [
-   "e580547d02a467cc33051ab80ceab8c920326a2d",
+   "71af369eed76f7fc1bdd60ec6ac652a06364ad00",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js": [
-   "97286ea37dccce405a8f3499e7b6a3f7f1805476",
+   "31eb5455e1370ddb6d9e04928a4b0e9b07988488",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html": [
-   "60862fd505c40b12802940b4ee1ca7dc5f816f03",
+   "2758cadfd00250de5bbef951669e26ea8166bc59",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js": [
-   "5f9478ab0678a01145296d6f15bc936b06825b73",
+   "f3bf8daad2ddcb564a88e54fec8da061cfe66361",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html": [
-   "b019c7435f525677803626f6bbbed8139bd70606",
+   "33d231cb3e66a01cfb2b54ed8776e821bef47202",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js": [
-   "75bc7f044501d20b7c273dab940fc0ddd9c32358",
+   "bc1ac01d2e7a425730b13d9a2643811b7ecc5538",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html": [
-   "3cb2b6f7165194ac75e6fe9dc233534b3de26418",
+   "ee3a21dfb14c77e8bd4abed8d680628da3a610a0",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js": [
-   "b76f8b7d4d964399c90ce6fc4b5b6d88ca135ef6",
+   "203b1c840628de842397b6b40feb4996b5ec5840",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html": [
-   "6eabd0f7274ed2e1875078f08631d4196570939e",
+   "2d4a2d4c098794905b165604d60be829452a0b0d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js": [
-   "ce1d67cf453e9ca19afc856c7a3f04efe6c0baa2",
+   "632b7ea2511f3741593e6c59b0bacd2a201a1b91",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html": [
-   "7daafd5cdd6b46ddc946bd83473b0155a5b30299",
+   "66600307a44117f9454839847229d2915e89ef10",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js": [
-   "3211f833a59570f40717f397f99e0dd132d3a48a",
+   "d7d1e3f9099f56e21c977938113cec736a735160",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html": [
-   "fac24404e48238be037b2df4f7d6efa9264f63ab",
+   "5061f7f4711dd95bd6a01ae801f560776736ac17",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js": [
-   "6574b9e8e6ec2a06d5ca3d510ce8c92c222b1cd1",
+   "795238357c4604fcf0bf4a7e43c8c34f39f39ddb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html": [
-   "2db49e11971ade1372a5c06c0a4d6dafbacf9ffc",
+   "dec47b205aa381dce73fc25a34c5266f23379232",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js": [
-   "eb9df1bb9596e7c916884b1f10b4388b158f68a3",
+   "86f292c4696a7101529efe6dfba9360a7659f44e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html": [
-   "19f8dc0b93ad5f022866304756d678be390004b4",
+   "2c3e403a24770bf0de573f5a307df9249f8ef23a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js": [
-   "e9c84d8d9c3ac659b8b3beab1bd99031e198b25b",
+   "6fdd72fc78f751e9fadb343d6e7d0b912bf62068",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html": [
-   "11f5c10a5baa123607ad3dc4788eb2b818a510d2",
+   "30b04590f545900f9ba2cf1c953246288ab104ac",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js": [
-   "a20f470dc7985a349169a43604b56e8bbdce10e8",
+   "cf34169d603c9bade13dca01e148b789112921e2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html": [
-   "5547bc74c3ec7fe01d45065e4d65946718e6af70",
+   "a2ce0fbfc7abc975e915ef2330cdd4b52a76bbe8",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js": [
-   "65a12a2d7af2b2e59205b73627b49273bb808116",
+   "a086a8e2223ea8018d9dc5942b67e1cfc60da0d2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html": [
-   "741aebf4413c35825bf81aa071541f6537599452",
+   "20cf26e44da54d4d025aad57226181f356d99276",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js": [
-   "0fac30a33ede668b160b2a9152d28fa2219e0a1a",
+   "759615962aadec964896bf5f42ef4acf9c8113de",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html": [
-   "37ca18c4b74dddcd6b3e81b67a3494822eaad8ac",
+   "2c10a7b2775bfca92a0d4f81772ab421bd8dd7fc",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js": [
-   "26fa7d350a020e8dc3558268e0fe2d62c15bfd90",
+   "694b07383474d494007c8a1e7a3eef2297a19ef3",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html": [
-   "3303453d0adfc4b116098d9580e954416b97b6b8",
+   "62f8edf95711f41dc5d9e1f1e9b2008540d9451e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js": [
-   "0ec73147be483e860436ccd5ce0367d66415bd4f",
+   "a41b4aee5b43078f1e60e9a1f186286e612c772e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html": [
-   "08a8ea7b795b1ab5510f65405877680f9f2f27ff",
+   "32e5742855a27170823429aeb519c65715124226",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js": [
-   "8e9a83d7a316e3c3f2129c90e0c88e686edc4616",
+   "b8ce8334e4899406c28ce8771a392365ed115d22",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html": [
-   "2b715291780071fdf00a4bf3efdaa5b29913b3c8",
+   "16b18d77e615e98373b1c87f833be2b4f1ddc810",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js": [
-   "37978d4199f05693f88d42a8fa09f747ed7b7bb5",
+   "b1e8fdd49edfb7d7fe3803f9d2c405150ce68b06",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.basic.html": [
-   "56eed8ed701fefb6f09ec752fbb820f80786cd63",
+   "ff8241b15611ad900e220ca6eb89dcca4d3af3fb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.basic.worker.js": [
-   "99499e30fb5a2b998bb94be9950d43ff4f26d32e",
+   "ea2ff8371fce2bb3e1f1413c065aff13069a3af4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.html": [
-   "96efe4773bdcdd081dc984a7c40cd958eccd8d8d",
+   "9a8feb1ad728b019e07903f5d1b52b963d654adf",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js": [
-   "c988b989ee223ffcea440f2bf445ae96da45ee5d",
+   "dc3d500807067f094967c6be7805a78a1225657a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.html": [
-   "5189d6b17dfd22802e1659d9f33fcd148992cbda",
+   "dbc21f306b4d4718e89f036dff1eb5f26a612fca",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js": [
-   "e593e8ed0b00512085326254d556dff56159c9e7",
+   "a343766ca29658741e889f8c35a848b329b6b6a9",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.html": [
-   "4b954ed81b85f94d9b5dca93f3a785709e26da06",
+   "8f3e74a865c7483f69b1fc5c4fb46a5e6e235f64",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.worker.js": [
-   "d01768b5e421cea27cc260d1a03e1255b0710406",
+   "968fd47c92b30e4c20df424315a15af822b0ace4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html": [
-   "82b0284b612e662c2da4ad382acee5dca590760e",
+   "50427b430a0e30d44876cb0e5804f5fc6c1bcc61",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js": [
-   "8190df7b7f575ea23492d84915b68353b2e57c6f",
+   "37651bc2f86875e94adcf8ab33acf5da3f0b3b5d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.html": [
-   "45d13e8bb349a70a370e6bb6c3ed84c1eae7458d",
+   "7282316776dcc2d587a724b51f2f4b58621cfe4f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.worker.js": [
-   "7f48abc84865cd272298f46b082d7a2e255f1b6b",
+   "078f1b3e9170a29d854888dce88b923905344c83",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.basic.html": [
-   "29c4c7920afa691aa025626c9769ae696d1bc08d",
+   "cc38e92227186d76df86ca3f13a38324e44a3443",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.basic.worker.js": [
-   "9d7e6fb821289e14ab1bf6d94ee328eb6eda22df",
+   "efa7be4b43a109376020fd1a914d0bbb1a14c014",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.multiple.html": [
-   "a3896ab46a9e52c89fb487ae7cd4db117899e75c",
+   "f6244095dad808c6124939a100d76882f74a4910",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.multiple.worker.js": [
-   "ba3d51b6ae278c3123479b232dba31b3a25ec789",
+   "83d8d678373f587402bd8d9d77605698c7b53674",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.html": [
-   "48bae9b76ee1cd25fd69dc9873832895de63b30e",
+   "96d27b65083b4aea3b08e7ea7ab59df7988edbff",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.worker.js": [
-   "afc53642a57b9e41f109c67029dbe2f5a47cc094",
+   "9188c66057146a7f938287a5d6f3584b184ea87c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.html": [
-   "ee79f44621e7ada81978ba8c1cfa59e7d4c945d5",
+   "d755a466b644ba6281d0cf1ebb7748af6370842e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.worker.js": [
-   "6b7283d9437d12dc9a1bde1f20230566ba42b49b",
+   "647524f14e53538ebefbd756ab3b61407a9785b4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.html": [
-   "469ec668cf8e71d5302d97a823982808eee65caa",
+   "f001f9d1e25e69dba11f2b94d71df345c0f73c16",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.worker.js": [
-   "22ff451faa5e746709cebc4dafe2cd4a36e7f4f6",
+   "473ea9d00af2255063638c0e153cd35ffdf0dfe3",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html": [
-   "3e2155f879a59185e958c93eba33dadb356957b5",
+   "ed94789fe6f42d3bd9258bd5f44c7db97f4b6cda",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js": [
-   "af4cf923b156b452e40930498f17a36618a170be",
+   "6f675a6ea22f040878d87ffe29621e2523445869",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html": [
-   "8159f3c60269550f8a9a2c04918c93614c38cb39",
+   "579c335047a2c2665b1075ff7eefd5b748248698",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js": [
-   "ede934f66ed67cd5b5755d5712ee6270eb808204",
+   "bef063c1de11d32eafba014ff40a31ed389eee4d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.html": [
-   "4a5711c51340bd87706ee89dc82f207c492dd1b5",
+   "c0c66ff236faf3827bf02996564cc199acfafa3b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js": [
-   "dc267cc580947f1d0974e1c7bc52362941d929ef",
+   "263e8428a3acf7b3b644cfbf8055c229001ab559",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.html": [
-   "6bcd8c678ee7ed58fba5b6d01d94ba2205c1e52f",
+   "34139a6897503cfc1f12df69270054643e0ec023",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.worker.js": [
-   "6bb0c1af0354026c578c2da2adaa7b562b686c28",
+   "770ab938f7aeba57dcc317845d3c2640a0006a80",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.html": [
-   "6caaf2a03b8b32d53d32a255d2738301c9336b81",
+   "f5e55e3f1df127d1b3fba5a11a6b4f7497910f0b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.worker.js": [
-   "23b5124bd0fa74192ddce9390f91381e335b8997",
+   "9ff84e22f1c7ee6077837f6af31d7c55a3315937",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.basic.html": [
-   "e786320d754b54756fe25a9a908188de0d7b3d5a",
+   "01ee0255c31b77626f9fd5d633c20824965adef2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.basic.worker.js": [
-   "9aa3af8db7d3968427a132438db9164daad98dfe",
+   "d63b7520cc6635f01de8c36dabb2a2617bb9e849",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.closed.html": [
-   "85e72a2139d3e344ec6793aed607048971fafb59",
+   "d2a832a91429e98d0b776fded55d5fa6f0e39fe7",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.closed.worker.js": [
-   "09c942c87a0e6f6fa658247e824a60206991d093",
+   "b772fb0e94d5ea3672fd7eeb416793c83ea438fd",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.end.1.html": [
-   "5317b3b7e869d8bb3738128d0d7dac403eb44846",
+   "5923620b684bd1d93eb9c520b411182acf15c0eb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.end.1.worker.js": [
-   "45e25585b6fe8fb0973b904bef7dc9f179794036",
+   "d2757ee491ad862bea4721b50044e4bc825c0c1d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.end.2.html": [
-   "25ab2897d3b276c9297edf1d9f8ea901c36e0de4",
+   "065b0a0ebcf3833ae74ef25489a30681f6058570",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.end.2.worker.js": [
-   "925d3510128ad45deb4750c5e39e5123a7ac7fae",
+   "04016e19ac5507b050d4150cfd7be86f93b41e7d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.negative.html": [
-   "2b47aa0db829d2fd86e47b9905a8f87a313dddd7",
+   "d9e68d191380fd61f4757e37665d17fb76d22e8c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.negative.worker.js": [
-   "88a8acc7ef761592e1a8b4cd164c4cc668966238",
+   "4e2900f36f80497f6eeb517b18fc3f8da4bcb7fe",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.newsubpath.html": [
-   "1c41d98b9be446f35542ce34e0495616ee0ed819",
+   "b7bb7845ba746717eb119a3c89bc6a3809fb8d94",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.newsubpath.worker.js": [
-   "9d3562ce420a17d4a060ebe6ef87a5bdbeb73597",
+   "0745ebf23fadd9b592bf7e018374b7db897e7f47",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.nonfinite.html": [
-   "0af2beec57d4ee9adc9940c75d35dbe6370b3689",
+   "45fd55ddac6cd3c33dd18a395db7d4bf2511609d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.nonfinite.worker.js": [
-   "8533f2577075e1c4485f5e3361af4c6564dfb076",
+   "144232e645f0f7b52ebec1d576a5edd47c7f18e2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.selfintersect.html": [
-   "4478ecbb7ee9e74e0cca4ac239934d14586e190b",
+   "cf37f76215f40694293773718bd5f65b483a587f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.selfintersect.worker.js": [
-   "50cc700b4af6ccfd3ab25ac7d7a081557cb98216",
+   "ccc806e59eeb08c7ba9258dd49d4187f36b26b69",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.winding.html": [
-   "b1ec5e2beb2be10d010cc4f0b2e5654a600002ce",
+   "5df38c1065a9734d50e3f2cd839090153339e909",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.winding.worker.js": [
-   "4f37705e96705f61f8d269e4e56378110f216c5a",
+   "bff03a4104df92317af07aa3b8bdc33eb98e3555",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.1.html": [
-   "5dc5eb52b3cd7c7285bc3d5ba5c26f4716344aa3",
+   "f3f4221a37238e85602eed4ec062a0c7eeabdd78",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.1.worker.js": [
-   "c64d9ef866ab716dd9373d76c08558bae6112dc9",
+   "397cae197032c77d8b49d630c314592674a253f0",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.2.html": [
-   "83925f67be42c1b82f67e4a21110776b9bc8b890",
+   "e86aa532aeeee47fc9a98c79641847d62f30540e",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.2.worker.js": [
-   "698e277f1fc0ec289da028fa1d6860770787524b",
+   "8a87de8e4c504c5b4b6b362a06e8e056181d081c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.3.html": [
-   "ad6d3be7f725726d4efddb09772353f2a958d6c7",
+   "5c7e81f43e5b2d6be02734d3188cbc50da3bf757",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.3.worker.js": [
-   "021a8d1d17b2a02b32ba018bacf391b570c413d1",
+   "9799ae299901b87765f3cb58d6c15e74d23b70e5",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.4.html": [
-   "ce2601f282f4c020e44cc1a52467a824719bf25c",
+   "4445a50c237b6f5941f0fb51cb8db609597aba8a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.4.worker.js": [
-   "6b8f1cf76b36ca5dac46c3e9e161f0e9141f50a4",
+   "f137c075faf49dc45a821789ebd0fb48b64b4594",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.5.html": [
-   "ae1c5dcfe4f656a7d00eabe9141df901c8108eef",
+   "ab46d4d84ae1bbbcd195ab81ae130c8c195eadec",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.5.worker.js": [
-   "ca87c25992fbe93be94d311f59116e5593c1132a",
+   "c3db0aea88322d61e3bbf6623a89a8dcada8560f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.6.html": [
-   "625c03bea4eb22359e4d297bf8dfec485c0545c1",
+   "736daf9f96cda3c14f6f1cea15042182b635cb36",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.rect.zero.6.worker.js": [
-   "855d0226bfbdb22d644bfc1bac83d0b1edd96965",
+   "3b0ca64d2ae32aa51de8350c8609e47c0ecf6348",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.empty.html": [
-   "e16937de52f984920572f1e1c987be325bf283ad",
+   "c29477e2dee4447ef8bc63db8d22eba60b379f7f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.empty.worker.js": [
-   "0fcc8dd22dba05a6c3c6bf6c4037f82bb5622b90",
+   "235038047870f969b11849afeb6de4f2791e0207",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.overlap.html": [
-   "50ceecd7e51e85fe2d8b29fd566d4f602ebf7481",
+   "aea20b2bb3129e0e609e97f5ee5afb6d5278968f",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.overlap.worker.js": [
-   "b70e65be7371e12b462e0620322cde0d628c3dcc",
+   "d97cfbca80fddd3945e5ada91b48dc8a4329116d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.arc.html": [
-   "76746a9cdca6fe0b9e6d1949ddd52440393d20cb",
+   "e323ce17948a4670bfb49bd407f31515132b1e81",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.arc.worker.js": [
-   "40ee31a718c43c80622b4b113709102fcb016e1f",
+   "812d710dae5fd42877cbd0eb588441611fc2581a",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.closed.html": [
-   "06a173b5b3d971bdc7b4be977412b8bd27821064",
+   "da72c69177bca2e3989536872b3f25314db975a4",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.closed.worker.js": [
-   "27176fa6aba6b7f6fb8a7afd4e40d163f0807b2b",
+   "407984ca2a461974fd651a47ffd739764f964052",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.corner.html": [
-   "b5f5209082d71a81d9f9b06d7e4d029a1206239d",
+   "27962cb23a0a228724e16a4cc4022d4ea945f07c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.corner.worker.js": [
-   "835d36fdf7642a19d8a8425feb00b88443837dc6",
+   "20e9e4b235d42abe84649c60471de199bb78e3bb",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.curve.html": [
-   "60c13bbca28eb73f41df768f7a274e385ed75782",
+   "62a39bf9934a20ae88ef310366100f7b5769936d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.curve.worker.js": [
-   "8bc8ec15cdc42f870174f0388495392729ddce85",
+   "1ad6d9a6109062187093e0f82abed6ebf118d6b9",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.line.html": [
-   "c40f61c69edfc3a24bcc232f02895c8ac0fe2ce2",
+   "1818c72a81af7de7efc8f2284e726827fef52f4d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.line.worker.js": [
-   "d9dc3ac1eac45bf7498d96743841baacb42ab34d",
+   "ad1ca83080672f50c127a1c19921b56f83360b5d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.rect.html": [
-   "74d60f774d26ba3b7d5cf80781b2ff930fc87bb6",
+   "d2656ab3953e7c07ae8c5f86b7526e994c726959",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.prune.rect.worker.js": [
-   "751589791a1f663e0a66fc041ce9e17080b63c18",
+   "102b6c1429231b6ffdb572e43bdc939e25eb95d5",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.scale1.html": [
-   "328adf1de76a70fd9b672ed3b15cc69a45b833d9",
+   "59b4e0e0a266f0f4b43f9b92f1ee649139c113c2",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.scale1.worker.js": [
-   "7996b61c3d977c8d8c599af7e6e26711ee8eba60",
+   "2453426cfeb69eba78240a7fcb68874e49da3747",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.scale2.html": [
-   "fc49feaffebf506d385253368b2eaa1ae3e61590",
+   "905c04ab41cee9ffca7dbe79e262c83aa3525e02",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.scale2.worker.js": [
-   "5d70b6a8a6faf6c5b693768b4b4ab1a66e378ed2",
+   "33e1dcdc15778ffb21907cf5b2ef42133491456c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.skew.html": [
-   "cfa6560fba897ea8e84580886f0333bd349fac62",
+   "689696572115cd6c51df5a7e60204704b98615db",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.skew.worker.js": [
-   "2d4e84e1c04842b1b228cb3a81672c5f897dff4b",
+   "b204bed1c1df647a6c8ac5042fd77c97c7d4e7d7",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.unaffected.html": [
-   "3f9f1de61dafc9042d9ea897f9b4f87089e3df3d",
+   "02d97a65579b4d7e44587a01f3fdb799fb9729ff",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.unaffected.worker.js": [
-   "c0444f756af7d4b37db1e30881ac65951dd2d8ce",
+   "d929697e5830f39844effeace852b46452e57523",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.union.html": [
-   "fbc65f121241b191a252dbd01f670115e100e330",
+   "da5226becf0971883c231f09b7842b65f9336808",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.stroke.union.worker.js": [
-   "c00ce217170e8df03915a97f377db3a5ced5d8cc",
+   "e84cee173f93f234165055914a216a5a1fcebe1d",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.transformation.basic.html": [
-   "e4d9e09e5dcccfd11c3d93d614200f0e10946a7a",
+   "d8df0e50c09d9d92b6cc66b688d4ffbc16f1601b",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.transformation.basic.worker.js": [
-   "ea0b9ae915216a90c874b37e85a3a114a565f56a",
+   "a8489b04994efef5137f793953907b56455155ba",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.transformation.changing.html": [
-   "c0a1ffebe946edb01ecc001d28520dc37c134cdf",
+   "bbd1e4114b8025b993c15a4e60bf3bab56d256d3",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.transformation.changing.worker.js": [
-   "5eb0d6f717fd84a57378fd0e968ed9c3daa182a0",
+   "ff70cc4d9c0e8c930d22790b5681a38fe4ef1722",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.transformation.multiple.html": [
-   "3ee6d0c76c65a8ccf91ce7dbb87b28e5bf3628d5",
+   "00111ec753daede99f777e4ed30331e83ab5b81c",
    "testharness"
   ],
   "offscreen-canvas/path-objects/2d.path.transformation.multiple.worker.js": [
-   "1999c27206d4f2b84667301554f6051d95e2cfb1",
+   "a8f2379d651e474be082a1894a1f317605aafe9d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html": [
-   "f2c53c263ed2785c092c573a2ba1e33afdd7811e",
+   "8d4fb29d0f8c04c58179f93105164215591a2b2f",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js": [
-   "40e3da1b6beb619ec663ca2795884634c40b7a29",
+   "8d795ec1ffe9c04e72892f45d92349fbe0e0603f",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html": [
-   "0ef6d8ae22b5aec4eee08e39738e7d51ee2497a1",
+   "cc895b7144c75b2a2392f646e30e49b84950e638",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js": [
-   "68c4a5fe410e10b3344f367deb493a2df8e0bbef",
+   "257bbd8c5798326b30fbecfa1850aa429719e3ca",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.html": [
-   "1b68df289bc7316abf143672fb20c3ee79d9a4e0",
+   "1000e44c8632043192a35030d27d5ebab40952df",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.worker.js": [
-   "b9cb934f2fc82bb6a4a3f09a937d0276d8011a0b",
+   "693fc5927bfd58440d7027af3c77353481bf7ea8",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html": [
-   "1048cb167e6b21a60d537181980f80ec0cd3ef38",
+   "3371b9dacb4870c99259422d6e983059f6116e18",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js": [
-   "3092a3176444a33725f9fe2bea5a5c66d67b293c",
+   "36128d98a403196c56fd15a5e91a3deefc6cde0f",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html": [
-   "55e999a9994040cc8ae19306b6ebd4810ac271b8",
+   "c7c0808236ea47f71639535085456d0a18a8dc0c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js": [
-   "392711c5cd9e158d4274eae59e2c99225feb1988",
+   "1512210658e8cbd1f3e13b1024588b31e3b10097",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html": [
-   "73d39aa7ba501b5c3a8f972b5ae94c3b641aec13",
+   "5d4b1d0f339b16805250b754a4130c12e632aec1",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js": [
-   "6d97898a6d14f3588dcdbdc9106cbcdcee552fea",
+   "ad34e6d02c0f3bb5ab85cbc4d85383a33e718637",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html": [
-   "ae862192c238740408c50609885aba90b5d9005f",
+   "4c42c6b8dd786ec601b6fe408b338e6a69ff628e",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js": [
-   "c93d1b5b68b4eecca3f97826768387b3dad2f7b2",
+   "5b2f8eb548c3bc0a376d1a159101bf4f48288296",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html": [
-   "5f0f19254bd1505e4d2bead3ecc6584e41dbb295",
+   "6f8afc0303fa1d3362fd0dab7fe0b3668319c6b6",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js": [
-   "4c8da252cb1c791a605cba10d9c3dfb272f376ca",
+   "3f588b0ad6bdee1d780ad3aca0aa67f91bbb33a4",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html": [
-   "78db73039416555b80d3a339f3f90e18aa112089",
+   "b1a123af5e6970b9bcc2a56ab3f3461652c7552a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js": [
-   "52b7e843d2e49c46d2f7d6b572b2dc3d856b4777",
+   "7a4d7d0853f31fb5443972e2fb5a15dc0679ec75",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html": [
-   "51416182150957a56850cb3f50e00a08b448c5f1",
+   "43a216cdc60c2ff960badf638af01b24a2f1f238",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js": [
-   "16573f1139062fac7033ba2c57706dc95c6b4777",
+   "e64977ca161778edd4f55c375b7f0ad4cd8173ea",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html": [
-   "bf148c945db5a325532480e3b9c971666d81cdd8",
+   "f9e730a9ba3ba68f153ac047c44c9772fa73189e",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js": [
-   "27724a2acf4ab554f5eabe3d05a53675b5258c54",
+   "d4f4e51fdc34ebc628abe08702613e3180225f2e",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.html": [
-   "861e3659fc330b532558b9070d0380a4e555fae3",
+   "ab544a97e572104e4e494c8b164a113837343c7c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.worker.js": [
-   "05d22f25ff806a1ce3cfb4b6f2a15d6ce8516f70",
+   "148296ea9bf1c341c24f5bf3bb18812528134301",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html": [
-   "e269cbc0e35902b48bc3d33772a016ab8bbd704c",
+   "6dbd9532aa67be4e5bb453bb2902b1d75564996d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js": [
-   "762e23374b5a49ee1062a1b8de116a7f03dc781e",
+   "ebb8279f73b2c90e0d91dd0ffa6d67c129e0cc27",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html": [
-   "c688c22e49f55ae173a2bf49fe92cfc904dd2f33",
+   "8d30b552a4a10af3cb98a1dbefba0dce0204ef1c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js": [
-   "bcf2e43b927716acd66f0a0500072530b988e644",
+   "b709ca6e99fce725092e10d5a2829b22d159bacb",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.html": [
-   "666ef2e857f1dd1f7cf384ecb2052b25ebc1e36c",
+   "32f8d52f3587394e94aece5877b8ba54a1acee20",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.worker.js": [
-   "5b98dbc5ffd08ffb1d862b03272911d150e6da60",
+   "269685ecb76dd8f006bf9f5b2d6d6aff5d6a1e06",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.html": [
-   "ff1c66fd3a27f4c336f2ef76baeef5e4893a81b5",
+   "96e78bcab8f217641e504f99c16dc36ae192855f",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.worker.js": [
-   "a3423ee5a8c54b8b575a5fa92874d71d02173946",
+   "a97251f6578a8ce464b8dee33cbe47d46116eab5",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.html": [
-   "0706cd5a358f253db159c051a48248752d3cf1d2",
+   "8922c3249b35a12e4388dd8839248e49f6b5a45e",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.worker.js": [
-   "371ea257056fa44aa96c133f87f2b28292819f91",
+   "71aedb5958817744dad9762537dcaf42157a6df6",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.html": [
-   "a5c7d866e75dd40d732e39fcf79fd7682fe03f93",
+   "f6a85938150d52412a00e22f3c9067553df3c274",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.worker.js": [
-   "e31ebc92a58549dd96cdf2a2285296762cf55cf5",
+   "0cc5b8bf870d93cc895a05983ecefdd61c976e6a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.html": [
-   "5cc141f1323cad329fdd3ac2abcdda7ea2972842",
+   "ecbc0a6e225f0172e2e85415cb4ab555433f830a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.worker.js": [
-   "a942467ff65a85416a33ce59ca7154a1dd1b3e89",
+   "0893f5e5a7f2e99c468381ab26fb2c14415e2464",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.range.html": [
-   "5fb46d0352c8b162c29f0dc683dffd8b49429b41",
+   "ef168ebf18757ffba4ea090a077a954a45ddf1f2",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.range.worker.js": [
-   "f3e93f21becf69bc93b1b8fc70b41b4ea7f4cb4d",
+   "cec597485dbd082af7352623e3393106c8fa066d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.html": [
-   "94539ffcb0df8161fe0f92ea5b1c6fad261ea908",
+   "605fd24d56d2111eb4ee1af0f9ed6c0a4fd4b66b",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.worker.js": [
-   "00f6cc53735bbe5516ecfedfd3c7179ac4fb3a5e",
+   "cef1c430fe10fc6826782e98110f4f86a42b31ba",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.html": [
-   "f4205318fea713523624545295a58f3f021c101a",
+   "4e4eda8f1a6fff8375b401f5afbac3b603380211",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.worker.js": [
-   "568dce03b558da4f98180202cb6dd57cfdf00f87",
+   "763700a0d988d65572bbd8f88cd6ddaf876d155a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html": [
-   "f811736f4ccf8b65e288fce9c371885c38d9bd8f",
+   "e2c3a1d88c925ab3d88042d26d436d3cc51676f7",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js": [
-   "adf912ba7b67b35555450cad556ef298ecbdfe07",
+   "9c30b2842aab96c3a025007779c4d3b2bfbcc1dc",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.html": [
-   "3177cd8dc638db41781657e4ed96417c0582600f",
+   "371e728d86fda52f88a02c6ae1e78568f1a3a94d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.worker.js": [
-   "791dac61e5c68030d7f11b897114e3a7571ad9b8",
+   "ea9136d2c0377653e483f69c8e0180e8ec431163",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.html": [
-   "33e65aa8bbf00d79ba1867217efc2cd7ee9b8dc4",
+   "0d4b06a53fad16b71bf73d3c88facca7f93209f3",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.worker.js": [
-   "d5cf3c91ef231d21fa8356a22f2ab5312f120575",
+   "17c3103969e313d84c265e0f197d761d939774f7",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html": [
-   "5890d365a4b94de023869269a2e0d8fd2bfd6a4a",
+   "3c461358222a908458e32def24e0debcb3dfc25f",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js": [
-   "0c0441a715c7379140b39de9542683c39aa8f897",
+   "a5a963db6c1d414f2fa856691c54e3bda67d4d1a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html": [
-   "be22bae5469fbf2e80f231da9891fae6d59ad88f",
+   "35068ef1c906e7c88695e06f5157759fd399ba23",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js": [
-   "07fe8981c8092c476cbba6d74f72daaec1abc4c2",
+   "9da53ead8fa0e6ca2dde3bfd0620467eb40d013b",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html": [
-   "ad05124ddba0510b5a51f0a42ecdb91f0f9e26d8",
+   "b44ab2b2dad1698dfcbeb23d80512e44b7a5b86a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js": [
-   "e888386016a645c01443d886c37b518e49bd0d1e",
+   "59502ed5af2c124c5450f7d4e06c6fa24972a468",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html": [
-   "3b17b93eaa7b184627707a613832ca67a36ae054",
+   "a6f0c977a69731dede52af3263a6745d9fd7fe9c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js": [
-   "38139cf24194325842997075c2431ab14d03b984",
+   "f8241ceddadd86dc40ba1480b147d25ce1c94de6",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html": [
-   "9bf9ccb4fa95135d041db79981faa97ef0438add",
+   "c56be5bbb3cf1a59663fb06556d8fec53c9f105b",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js": [
-   "df4379fe53396d21afb5e1900155da44573f030d",
+   "2bb6d1f133784e44002c6502a5c2ee00221d1c3e",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html": [
-   "cec6ed4aa11e04f0a2b4c3aeb9fca6a726c48a31",
+   "3901fac7f9a2ac7c701dc527f1ef01288be4afd5",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js": [
-   "845e32d0bdc61dda092660161751ee5223ffda6b",
+   "1f76abb119fcc761daaeb3d02a6ed21805093e5e",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html": [
-   "948586400bf19c605bae7e54445ce8766a3f0991",
+   "aad77df15a888bf72d01294dc857524b1057f4e4",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js": [
-   "e191464c66f014cb9618c1d12d7dbd872f2b04a0",
+   "8eb5438124384e7f58ce884c0dca491e96070229",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html": [
-   "56fae70d4422478fead24e0f84d46c4aaa6d2f10",
+   "a85028750eddf27a97efc4d6058210fe35cf5d09",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js": [
-   "933be0fd2d686ca850018fb8e65f5878c552b392",
+   "de8b2128e9a319cf8c55982fd48dc7980c96966d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html": [
-   "e003c455d5d156db731af243fe3c6d2593e4b250",
+   "65858e6dd308add676c6ac0557b2b0b38c84ece2",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js": [
-   "313c5437fcb311fffa5494ba9c6052cd740750be",
+   "faf8b45725cb8d30e4a7bfe860bd614c1e29c3d8",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.html": [
-   "8c980d63b93a641aa964ffe5ed916cf4c3ba2da0",
+   "d7771dbefe55877cc715dddb3d537a84a0268cec",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.worker.js": [
-   "fbfcf0b31cef5cd79c9ecb57241449d5bb2d3908",
+   "1ad7f6247a8104285b5b53f699e3ed3f8d35cc08",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.html": [
-   "49dc91805da50f64a93dca59d5fab5407df0cc34",
+   "fc31f89a022d211f15e0c9fe70efa1afd4f52d40",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.worker.js": [
-   "b83df3cc03aaa3d77d3fe8e0787458a98cddd8ef",
+   "c208df980c088c18612917a841c9dd22bc73dfa5",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.html": [
-   "053587101c24e6b33bf469e2192bdee3ff750dc5",
+   "ab43db0dae94954b1892af33d288f93e0baaa950",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.worker.js": [
-   "99ab50e98bea6a1f82800dbc736d819c65a8c102",
+   "bb66970d1fff3cabaff28fba8c47ade5d0d931ba",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.created.html": [
-   "4c11fc5e203d3a7623e52b1bd1afb62d87ee7823",
+   "e701423ab3e66b36681bb85e22877ff70ac511f3",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.created.worker.js": [
-   "3bc71e9bddbcb146a46dcbb6b192a7761487210f",
+   "8dd7094a127a4d0f97680264f72fbde3dd588b7c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.html": [
-   "ca155d3f64ca84117d129c93867f0faf6ef901e4",
+   "e99e9781ef00b26a8e96fc1f57318de1b7ad6018",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.worker.js": [
-   "b3e5b5a1e7f20851b63b032c82d71f1ba35d7123",
+   "39dc92dbb40c9c684e83196f959d034f758e46ca",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.html": [
-   "6617ec41f148286aae34e0216e4054b9c4178d22",
+   "762f4ba563eaf35f3a56429f1870c99ae0f22628",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js": [
-   "3e0b4705d570a6c4ed1957475f65b36751d16a08",
+   "cb9e4021e61571aa100c6b0f9cc600b0aeb02993",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.html": [
-   "29c10946bdd4cecdc28b36eee74423bae817988c",
+   "a1c45b95fff51e09ee6f7b6298ccdc2ef89dd419",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js": [
-   "aaa5e1cab46250a02c89fdfae7776ec11d01099e",
+   "87ce21b42cf8dff6354cdd0dfe7a28f492e78774",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.html": [
-   "eec2d5c8a5c2c338c4fc04e7b7be91586671279f",
+   "f5f93f5c6fd21f31a7ad3cf96702b0c6b58a2989",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js": [
-   "6ee061c2c17913ab14508293a9732b44d0c445a7",
+   "14ca485d4a19e825f233c4f9634783df4759061a",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.html": [
-   "a26130a13e1b5a92344272472d924fe52f0e29e8",
+   "1fe72b887cd14133f80cdd0b81058038be5f36f8",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js": [
-   "7111049a7d0d997b27463b955ac5862b813fa74e",
+   "dc8f07dd5bdb0e8b85a02dcd23586e686f8df8f8",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.html": [
-   "9ee0b491c3ae93a90693b973c5b7bad969851885",
+   "9c0ecc591077241d7e6bdd13dee36b372f79d890",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js": [
-   "98278b12a2c303a84d24aec7e51c1c1dcfec4041",
+   "f4a639a15fa84b99b438981a27186b2ed59d0443",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.html": [
-   "ff06185ce4dc1562288b99cbedd59cc03ae1a495",
+   "1b070be0735886afa26c9556819b85aa0162ac4c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.worker.js": [
-   "ef522744992ebb7370c2fb4c163a491eff7f2bb6",
+   "e8144220d16633ce256a1a75cc27451af3b00814",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.html": [
-   "75ac0591b908ebd1e094506f04415f92e0b8df18",
+   "9519691b991f7a78cc0d007fd81239f28f15e909",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.worker.js": [
-   "81658080747ee3d8d0e41af21ca26da349228c9b",
+   "97b81d71eaccaa5fea80607953193399b25c9c62",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.null.html": [
-   "067b5c297e582c374681344277437949c7cec2c7",
+   "f36f93eeddd19b391f756e943f27bbab74d981c7",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.null.worker.js": [
-   "b558aaab5718c937ff216e1f5e79c1ae0eb6d197",
+   "e7c4b3bc0118bb4c8991010ae9cd6c62675810ec",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.path.html": [
-   "62c5047ff5114c80abb3b705b8ead9d5ccaf5104",
+   "16357678a7f95a3405f22921f54284d06778f1e2",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.path.worker.js": [
-   "da5d7700b75188e679460d0068e0bb51409da06b",
+   "07d3a8a7feceb0bb02c73642f6efb42d8795ac6c",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.html": [
-   "b9c269d43e0fd26f8feab02c51462b863c1f7d85",
+   "6a3170ddb8b9d913fc470d8c68fdf50c41c2078d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.worker.js": [
-   "15a6ff1e57762ca6afe051fee4fb85dd0b38c718",
+   "e714f418386d866dd655f69d19c7cb10dde635d4",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html": [
-   "86d943f9d136227bc85f66cac871a039abc96f8f",
+   "2d08542550672c51c3daba2d213def05442c3efd",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js": [
-   "091593f6abad99b7d31d7a80c1e62b2b1ae47faf",
+   "0af905832e605b0853792a8c60456407bf29e57d",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.html": [
-   "7d726fb48c606b20f062dc317994528c5d1582fc",
+   "90700552371d3435b4bed200d5afc508d118f590",
    "testharness"
   ],
   "offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.worker.js": [
-   "001a9e719fa7be28069cd03154db191119f1927d",
+   "93dc33c07955cfb8e5eeb87c2aedfd8418bba77f",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.1.html": [
-   "fdfaf7568d4a8ed47f27240e4e3b40ca5f36358a",
+   "4a896934b2527d66c1c62c132870f63a20644233",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.1.worker.js": [
-   "6ddf9a0d24876d0a9da10e61f476861e7889fdfa",
+   "6db743255fafd6ad51707630cae0a1dbd16d5a6e",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.2.html": [
-   "524f59a7e3da5fea1086644ab5c7dea849e006bc",
+   "7df0eb5412b9c02d9a7ac4ad60aca8f88b966a4c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.2.worker.js": [
-   "e671c1a095b8fd98f377ebec7a9b9a24eb5766f4",
+   "47c5cb935f4bf0f1d53e970323a494a2cbdeb7a2",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.3.html": [
-   "5a089b9b71ac18c2097bdf3e147032b810f037cf",
+   "2d909f6eba63c6d68217885e4e119a231e79ce05",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.3.worker.js": [
-   "25c8c5acf00c3ae5e554282234fa131c4fb9c586",
+   "bbba5e7542d17c3e075d282ad1a1f3247729c484",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.4.html": [
-   "a8c644adf60421ac20594d86b4352252a1fbfb06",
+   "6e380817ac83ee7e8c8b5a688fa9b7f18ec75719",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.4.worker.js": [
-   "567b6b884fd8df75a92cf904aad4b66e78800fc9",
+   "838fb5bf2c0321a7d4260395b448792d9201ccf6",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.5.html": [
-   "2efd35676d34da5b41e327a08533a1403e0a312c",
+   "e465d3dafd232d8b379fd158b5dbb64150636632",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.alpha.5.worker.js": [
-   "3ebaab64f1ac600df65b562e7d886f6483f3e31b",
+   "747aba71127f80d180eaf372a6bcaaacb7e6b323",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html": [
-   "b7169679bb1fa1575f0718b0f34d4bffc4c05293",
+   "a16f99f4bacba67bfca88dc6a77a55ab26bdbbf8",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js": [
-   "d5695c85bb202147182c6a8e32c672764dd46a2b",
+   "5a64323434790b8ca97e227cd6d48a8823cf2fec",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html": [
-   "4b2115da3b42086f7cdf8e82773ea04c5e273933",
+   "10cf971f742be97430c13da43fc4bcaa44ea9958",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js": [
-   "87362f099b46f742f52c239bbe2a6d53d960d2bc",
+   "f094774e1195b58d431cac688f21bd2e53e0bb96",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.html": [
-   "c00765791a910c4ebd367a6b67d5d290d5676ded",
+   "df387763c38cc68869ccbebb56abe1c49ad685ef",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js": [
-   "71fc28b72f98630885db26bd9e7c83daa11de055",
+   "63e9099db76e8e0da9ca9b1bfd0f479019da982c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html": [
-   "f92379933d11bc35bcad7fa395c796e661c963c1",
+   "1bfc3e5c670a96a6d80543de73088247b82b7a2c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js": [
-   "b7d9257a946639abf7fae737ba7ae6bc94c42fc8",
+   "bfeaac0116407a03b69595845dfe83f5d5b59a5a",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html": [
-   "704f07c91e83216f90837b0430831d10e2c88d35",
+   "c429eeebdb9f726148e4aa4d705f417c43caaff5",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js": [
-   "a7083941aa8f5a85b6516bfb1b8187b33dbb4657",
+   "d11e0fb92e278f0a917b8cd34e34b14ab891d128",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html": [
-   "22c9f192a592f00aa58c3d805c1f24e5bb87fef1",
+   "e892f4b0bc5341083d7e224c63561ea7e99c3d26",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js": [
-   "16cf774ba034171fda6e8a58196d8c676feb74aa",
+   "4b6644677458f0c6d7363c8b5e5e17a3abd5cf49",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html": [
-   "a844604b5c8c166b4444bf04f50da812118ebdca",
+   "43b269ad35daace1a279f12e1854ee5f67803220",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js": [
-   "978b234c6f04e0b1f94b86b78d42b850dea8f6a2",
+   "d31cba4fdc1f96810745435719552127932b73b8",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html": [
-   "2599d797aa12e5fb9d1bfb8d37caf888ab9cb1e9",
+   "1766fe0a02c9085ab911a3bc911f4d2d6cbc4ec6",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js": [
-   "3fd10ef1b7d6ceefbb8fda0eaf41962a8777c428",
+   "42e51a2c5bc32c7a84cf582ea2b8daaf8f914a5b",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.html": [
-   "fde6e64a7b46e86070cb63c46a697dcc26d3854e",
+   "258f0486d7fbb635460ebb92ab7d3c424119e5ad",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js": [
-   "0956222c4e174936ac9658a499f26d552401c340",
+   "ceb0c27e65de8330ea31fa3a4f0459262b929c3e",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.alpha.html": [
-   "7e77dff26ce73a455e7626e30042dd2fb9b1fcc0",
+   "68a46f3c85bd13828fe0cf9e1a054315aaaafdd7",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.alpha.worker.js": [
-   "00a914800b721df2b1f7338ae8a68a40a57dc20f",
+   "9d2e21e52d9130cf481092ad861d77ef9de7eb81",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.basic.html": [
-   "25ff73d6412cc0940ec1157998aa7207ddbffb17",
+   "d60bfe9f8e5902ad3be8e6d6f1ea4d95619fa895",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.basic.worker.js": [
-   "46aab07b92aa19269717d7a8eb10d5a170441f79",
+   "8e3577420b5b6bfae5d4590cfe42c70ed37c6ac3",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.html": [
-   "df6590c8e1917bf4c390ad6753dc4a2c45e082f9",
+   "edabf990ea5370b2fb0afc32b31ab58ba5dd56e6",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.worker.js": [
-   "6a631f330a62a8b9bbb2990d089d9b570bbbac57",
+   "fa5812f16c3749d33b26e8d7e29961513d4487c8",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.html": [
-   "6f4a8f9909fbd241587e5d08f73f3743c541b7d0",
+   "2612bdcb74daa19ae57751f5df7eeb3b10c72797",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.worker.js": [
-   "a9c9a7ac9cc2a0ba9398b7bd36d26b08d05d8135",
+   "c810e47581fbc556e729f285f0cac5daebd9c740",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.clip.1.html": [
-   "d452c06ab7000558a0a645617283c9c4ceb2b79c",
+   "cbc2670a2b28186b7e0ce49b6b85386c894c6a1a",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.clip.1.worker.js": [
-   "27cb869d2ba3abbce47e6732f5299d0ec17dfc2e",
+   "722194f6dcd09525360fc8d82a4a40072e5344bd",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.clip.2.html": [
-   "dc2992cf2305ca5d0770b429ff8ac557a1785db2",
+   "9da2ce4726341ad9a74f39c88c2721d69de70a5c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.clip.2.worker.js": [
-   "8ea9e97bd789a2f6c5c5159b08cb2d46e7608d6f",
+   "765dc6c1ee8bf1d925b52043f3d8494fd829a513",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.clip.3.html": [
-   "182b93a1721cd6638b0d20c7cd27db21d9beb96b",
+   "07c1fc068030ede50314f8372f5fd8e5495dac7b",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.clip.3.worker.js": [
-   "01be0657ff2e44381b1e52ca47819d1842f4a6f4",
+   "3d92d2aaf2f20f46836d5f7c75784d8e528bd22c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.composite.1.html": [
-   "a80ebbdb051bb1ce16d86d5ad7789a2f903bd2d2",
+   "3a29be8cda0c07aa7b8ae0df84a9fbfe1ec7df57",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.composite.1.worker.js": [
-   "f8c80dcd24214127c09c216b7914f19c28468105",
+   "b4644506ccadf53314599c86a8f3feefc17fbba7",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.composite.2.html": [
-   "d8def5cd7ee0cc0cda0cada8584645c10cd7ddec",
+   "67bb9d056664da237379776d7e1253accacb19a1",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.composite.2.worker.js": [
-   "2b93baeff70a656dfdf0d2aeb40daa1aa4fc863e",
+   "7c1a408a2e9534ea8b5f1c9ad42011fb84ca4c87",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.composite.3.html": [
-   "d3c68b50374db7a403cd461c281be074683f0e37",
+   "f9372926dcfd1538ce55cfff72032a233f114473",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.composite.3.worker.js": [
-   "75a5d2745d9998e610d3bcc8a637022ae8d7d94f",
+   "a4a6ab9505448dd058eb0bbb86a163b5416bdd5f",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.blur.html": [
-   "23a6be1aee24f5f95cd1f4361458b88740309d46",
+   "c55c19ed7a99a6e6c0b496aae0968503ef992693",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.blur.worker.js": [
-   "dc2563ff1f6436aaa06b6453bfc2824f91a3053c",
+   "d150182127dd5211ab3562ff5c804843cc5dddd2",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.off.1.html": [
-   "b35cd5f1c859d411b14b86475b016e86bb6cdb91",
+   "f9a284dd9b9a0ff41bdb7ceb2d80d45fe3988faa",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.off.1.worker.js": [
-   "878c7da3c3d89dc336025892a1c079e8a5b7c57b",
+   "863f1c682dab48ed618e7a36d6da6711dc1b80c5",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.off.2.html": [
-   "2825d935236c07f9de79724a381c4f25bea6a953",
+   "924fced9a025136ad87903510663effa0ed4e146",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.off.2.worker.js": [
-   "9648af5fdbc80c079a5d957f96c9497439e161d1",
+   "cb10f522c62c37cfca5930a6b7b4fc764c0ae23e",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.x.html": [
-   "a0506f4096be6ed7ee6c2a7f2b5a3bf9892823c4",
+   "d34a2cbdc4cbf8c03db8e9556f415438e55dda08",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.x.worker.js": [
-   "f4912bfd3c5ef744c96d7a6a7bc1b0dc6ac30461",
+   "c419cabbc00fbcc7ea4e0d2559fbf454e6a0ffc2",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.y.html": [
-   "2330635e0cf18497c105abcacf858013056f254a",
+   "8d7b2671855544a2e11d0acb637da907c8df0984",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.enable.y.worker.js": [
-   "a695b8e6dcbfe0bae9b8d94df0a772602807046a",
+   "6117d996da9060c566a4c00f7f326c42579f2c89",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.alpha.html": [
-   "933de201443d18fbeafd7c536d76e9410dc9726c",
+   "0be3781ecabdaade666b3d4a63d9920ee92bb772",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.alpha.worker.js": [
-   "9e8fb64260e76a16205e1fa2bc3c82cf5a6c94a7",
+   "637cc92069fa69bf9b73a7e90f6072fbb136df8e",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.basic.html": [
-   "5fa70319f7c9ab1396457b89dc13343894ef6441",
+   "f56ce6c23bc445192d7e758f216d47aa09f43d92",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.basic.worker.js": [
-   "9c28e57bb557da8a8a9fa342c27c19400a6fad41",
+   "800fc3153561bdf49c8ccb6da5e911388142c9ba",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.html": [
-   "55d362164ada71e9b253792e0faccd19c6d485b7",
+   "6e79a641648a2fb915fd56c24d5e6251075ce4de",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.worker.js": [
-   "3f5addc7d6f81478a6bf663bb9138e2f6ed6f547",
+   "0f0fab85e5b26a305f25d51d470d0871d82842bd",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.html": [
-   "f15bb989e998ea7c4da690fac8f05530e5d6dc16",
+   "5e7d40db121ffc2aa20e9129865185e97d1549e7",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.worker.js": [
-   "e5785b8019b0f634f0580bceef1e4cb9425fec83",
+   "606e852a1f36ad8c51e2d52266dd02b84e77c777",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.alpha.html": [
-   "401df16afd1f2475a748e2a581c19886179af754",
+   "205e32de01c6b012989b042c4f8627dc69b93ed0",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js": [
-   "54ffd70218bd6eff70dfb1e63e61d47c93d46e5f",
+   "b40be65f5cd34c533c03d353d428af74504ccf0a",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.basic.html": [
-   "47a8fee6e150b37a58da24c54a6433fb1108044e",
+   "9f16324a861413fbec0b8deb82a88b01e172147c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.basic.worker.js": [
-   "0f192f9a3df9a0ad065783ba65694a6a97dc6650",
+   "e55f2d64c47f06bb0a84dbb812ded32c5824b361",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.scale.html": [
-   "b2c02122f7ee00cf8efcb8eec40b947a9eb9882e",
+   "a1197f21828ca1924a76a12691bb6fadb1fdbc91",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.scale.worker.js": [
-   "2b430a02b89f4dcc97dc647167b72012eb1c1093",
+   "e1d6198f344e30b7c71137f0a63e66b2c82a3d34",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.section.html": [
-   "3efd2aadfc5e86b53a8920b1499390e9f7607cb2",
+   "b3f9ab17f04dffa76bda6f8d7062ea7d12ba8743",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.section.worker.js": [
-   "73f76e50fb9c2bd10c56ef8affa5b51f680b9c73",
+   "a278f4666dc8c6e4c47b4a4c7f9afa2de9e81536",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.transparent.1.html": [
-   "18972fdfb0ca80406d984918fee7e5f48b71c71b",
+   "05c125a376fbc7815743913753f586b442a4c559",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js": [
-   "465e78ca800ea69ad5997b2ffcafe38c844fe1c7",
+   "599140ec83aa04a7e0d00b17ae000020968b36d1",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.transparent.2.html": [
-   "0ddf21c08042f692c383755ae67f70f86c0897d6",
+   "32fa486b3f489622448cfef9fd96373220c9a2e4",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js": [
-   "d64e765eeb033837b3ba4f6e1bf067a9bbd61004",
+   "5b8862c0c8ae56721479bcc210efbebd644cee63",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.negativeX.html": [
-   "33a675d8890c644333cb5bd7cffed9013bad41d8",
+   "78728e0a470cb2a4fc5f67db2dc342c364150059",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.negativeX.worker.js": [
-   "0135a7e807ddc01041a4113694a86224060ff306",
+   "b0679a6014eba1225b4920d66f8171b3d428bd26",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.negativeY.html": [
-   "3f7063cad8f54e4b55a398c2e40ede309e7cae6e",
+   "5123af872f4fdc30a4146059d69d53d521333558",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.negativeY.worker.js": [
-   "f2553c5d96b79362717708828bc244d0890a13ba",
+   "d5dd5b6f1f2133b0cbd7b000fb3fa0e91ee37876",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.positiveX.html": [
-   "05ff73cdcc962d79bab16895f242d029f1f1f2d5",
+   "276c10d8de9e08e341dadccff46eb50621b2ccac",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.positiveX.worker.js": [
-   "0b6fabd7b6f11427507b604928038606d0de8af5",
+   "d4c4130a92c40e07a28655bfe7f7887352860517",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.positiveY.html": [
-   "d5857a50b3a54cb48be8538842b2e4673be1c8e5",
+   "53ae2ea553f05f171cb8c111d03b27a8b68b498f",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.offset.positiveY.worker.js": [
-   "dce9816c61df5c46fd35b1b4e53d0920c14ee98a",
+   "086d7ceb7d7f8abf5825b25bd6bc54f9443eaf82",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.outside.html": [
-   "776cbeed4210bbb68e905702556aaf64a6254123",
+   "f9ca6b49ef62da91e687c56404b053c0ea2a5db3",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.outside.worker.js": [
-   "9c389fccf0445dcd3ed155744f910001faa37b87",
+   "f4c7c5bad8fd52496d6fefd091d90d1e4cae7c69",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.alpha.html": [
-   "6af064409e1bdc7b465eb8a46b4d1852c2f6cb5b",
+   "3e55eb40003a92d6f01cfc96a6c32f4f211ed46c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js": [
-   "b911bd756b0bdbdb0e8a3870690e2d017aca494c",
+   "fc6fdbeb03e38ecd012b40777ea2800d2e37af59",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.basic.html": [
-   "ad7fedc386cdd25f9ceac68a51e144f064452c2b",
+   "d70f2fce6b3058ba2e391f87f106fcf2d68e0367",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js": [
-   "4166c283d0d6d8029ae3a055bc32b434a4550fd4",
+   "5c2a7c97f94da7ebcfc692f47b6cba20f74ad570",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html": [
-   "348c79b1b33b8c7ae1bcbb3bad20b56d2795e2e6",
+   "29103ad6214f41ff12195a9554ae9e1616fd4918",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js": [
-   "2ca00dcacbb32f6c95fe043f9173c35886b13b35",
+   "bf8781b3eda120c7f3b553a65e5f2cd01d1c456e",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html": [
-   "2cc6a44bfdda16b6979a704d7429e244764be61f",
+   "6509bae1f55867618e6cbac98e1eadce35e158f3",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js": [
-   "b0255facb2edb9244d954fdb6b75ca07741e98bb",
+   "8a2b7165e78e35b6e15ece3fbce50cb5e521f51a",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.basic.html": [
-   "6d71ea25e759ee9fb5c26c0e011861dcbeb3c119",
+   "5163682af248576e3714e71b42d98dcd7ea0ec7b",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.basic.worker.js": [
-   "72f0f7b991c02432f46bd806d061d2d65f580c53",
+   "d1e59f9b00247a770d08bd52b90f11c553fedffc",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.cap.1.html": [
-   "7a9995d833ebd9c1c18a814c700e17d81525d38e",
+   "c7b08aefd852dc53998dd3eca57a6e3225834c88",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.cap.1.worker.js": [
-   "74b1b94f91a1d2f1534c738e6c972a46270babfa",
+   "e2b67c384e892ad73c8def2b883a5be8b5cc1da4",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.cap.2.html": [
-   "4ff35648b02ff52c27f4ef38464a342d7bcc9884",
+   "7d94d3ebc79962060d46a98e088bfab182a990c1",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.cap.2.worker.js": [
-   "ac25dd8cb3522f5272442379ef59716c4ba437b1",
+   "68dfd0aef89b1f1fe85082cfc8bc4f472eccee86",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.join.1.html": [
-   "3647a5d4c3a7ea3866016146ad6aa89ac32bb018",
+   "6043d04e5c44a2bfffa7e913b8e47a858a124aef",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.join.1.worker.js": [
-   "65816df7e6058d00699cf9085f6a85e8a0a7a29e",
+   "3aeb1239da8baa255e7b28353ab9a5ce03735162",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.join.2.html": [
-   "70c96ced4c16bb3977e0c133e7f153e06ca7603a",
+   "037c2c793e8008502a89ea4a6505373e0bacdff2",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.join.2.worker.js": [
-   "bdcfd09d80cb002b1f5bff1cc16263aae6c66fe7",
+   "32e1d3c2c487e9a1ada7b6ec003c2bef9f4b107f",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.join.3.html": [
-   "93075330364f63d8d07c4d3fb46a70fdb4eb6da4",
+   "7c20a5f87d68707533eeb6ee0d5449a961d57174",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.stroke.join.3.worker.js": [
-   "a769515d7bfa8ac57c16820e8d8429015bb7ed4d",
+   "0a902fa2af93b3bcb2f4b8bd13cc213ec1c11459",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.transform.1.html": [
-   "09809ccb20107f7e086921058a787e92f0b700ab",
+   "1d677acf3d182741fa3b68da5b7c65681a39516c",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.transform.1.worker.js": [
-   "928f53791d9bd08abc9e3cf1b8a2adcc7e05a747",
+   "8f8d23de3d394b53e3f575a64f1f2f2b0e8040e7",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.transform.2.html": [
-   "fb5c3225fca59bdca51e6e376f08ced3b1ceb80c",
+   "a693521ea95d669f907f4b650c355b1447a1fd8d",
    "testharness"
   ],
   "offscreen-canvas/shadows/2d.shadow.transform.2.worker.js": [
-   "9cbd71de5f833c0f61303c1ec473f9939e8fe681",
+   "2f1c8864a0bfd1ceb4051db4bcec3db3a82938a1",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.align.default.html": [
-   "fc1dcd7adf331ca91845ab1214b4659c42915bab",
+   "5eb9c7eab19c987443ad8d7bd7b56f286215cddf",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.align.default.worker.js": [
-   "bd0256d51713efbb74ff9912848712a183153a39",
+   "9338a606386d21327101457644287e420af33720",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.align.invalid.html": [
-   "f1ca61b6b711ce36e389b6dcf82db693c399e477",
+   "a3d78d8de293a5d039b3c7618f5b538400e807c5",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.align.invalid.worker.js": [
-   "c528e43524bfcba50701e381d76949931511712c",
+   "66ce7aea15fc7fc23dc698484e2786e713e71053",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.align.valid.html": [
-   "d617ce0ff6ecf19a6fcf97baf899f8391a9a93fc",
+   "c3f24ecbc458d223fb42cbd0e36a97d834e043f4",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.align.valid.worker.js": [
-   "cdef885dcfea1b6c3dfb420963a4849dcd556a81",
+   "569cb91e931430cb77a73c2086962c2843f77b80",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.baseline.default.html": [
-   "a47f5c565242a81706bcf025b2d2b7afe5ecd561",
+   "ef0ae20d1003f94296242f6128a172f80fcb0134",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.baseline.default.worker.js": [
-   "8bd65af372e9597cc40d64368b7a4e3e92271b62",
+   "6d76b34f365fc0fb0d0bcffb0cfaf888743931a9",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.baseline.invalid.html": [
-   "8e4508fd8345b5dd251fd8d3ccc0fc97bab4d091",
+   "908a9df40312f695e3b9042bb2302a17b6ebf53c",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.baseline.invalid.worker.js": [
-   "82a190360d602633c46399933685a77261b7b0ce",
+   "805abcc09343f115e9327d9968fe7caecd603a6c",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.baseline.valid.html": [
-   "c9d3bffbea2a2abcbaf04f59521522d372502edb",
+   "b672d41f4cf5abeadd7bcad0151804fdf70290d5",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.baseline.valid.worker.js": [
-   "2297133e7d8de312ff6a54143521906b4e42385a",
+   "35da35b4ee9e1babe59857b6087774d0bcad68ca",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.center.html": [
-   "c89105373bac2023184c9f3dfff59335ebedbc83",
+   "c299cccb118f000a8e82dc226e2511b0948c0778",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.center.worker.js": [
-   "a548b43afac0c587354620f93f03480630d4a55b",
+   "021947bd2465923d515bd353cb9950d5229cfef2",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.end.ltr.html": [
-   "342276420ca04b4180857581ec24e16c06200164",
+   "f7fcb36126d6481693824988b8c6003110e8e99d",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js": [
-   "fb25821f2f9271e34653f3b2a012378cce552031",
+   "1e529be23d7e76836af2ac8d8f7f9b6181ae755a",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.end.rtl.html": [
-   "a759cf717c925cfbdb8f4064d19fb37934fe6985",
+   "016e1f8913ffed43ca4e62f639ac432f6920b5be",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js": [
-   "041fae76b25dc553c82c41f6a21a7a3b5a801664",
+   "f50987c929d5a84b750c26a32ee26865f275c742",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.left.html": [
-   "a46d76b0b21c2d3b0359abda4d4b22389699130b",
+   "d83bf0a7378ee4c1c6904b92f72505f9bb8cbf5a",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.left.worker.js": [
-   "c474bf10409c35427ad4826ad01522874655fd5c",
+   "02e689a9d7c66db31e958630d476ca6d9a6057b7",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.right.html": [
-   "976256e98e0de51b155d0c9ca642b6b97f3d070a",
+   "9f752e631915f92ffbfaaa29ada5de5b87ede4f9",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.right.worker.js": [
-   "fc01a85b1109fe48acb7407593ee039ee626fead",
+   "170661d84a0cae6baff80b42be73e6eb88816228",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.start.ltr.html": [
-   "8f2cc090d0f6c7cd40f49bf6c9b80a53fd65ea11",
+   "33c3141b62d403ffcf03f35ec6a0cc97612914c0",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js": [
-   "5664436dfb66a2ab4c8c7082ba98506d7db4481a",
+   "5a3423ce8cbda632de0b989827812d6ed6bd3973",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.start.rtl.html": [
-   "6e4206e5deb5c2f7f33dd0436b2212bcb5748366",
+   "ba48f70e4b9adf910098ea5e86878d6deb710a29",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js": [
-   "3ea6fe9db2a4592a73319271962dd7dfe089878a",
+   "4c635cf40e5c886c6dbd58c420e4a05686a194bb",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html": [
-   "f95bcd40029ef5ea8994575265ac80f882d44223",
+   "f0957ee8e3f661943b26f154a1c3080164698fb4",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js": [
-   "8b973e5a2dddbcd2b088665e6a1840ec3f923ed7",
+   "4c18c8fa77770fed231c06408e25ea9b267a303b",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.bottom.html": [
-   "0c777883439075156bcf11141a1fcf36c9eaf457",
+   "20447edafb7539b739b8f2eccb291b78b5adb1ae",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js": [
-   "3ae948c10563385b28b28b51f737e2efb0fc75bf",
+   "851ec749d496332dd519af6a8bdbb26af886d805",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.hanging.html": [
-   "46a40c9ba1e5946c9af7fe704abafc4c96f818af",
+   "f3a7784adbf92825031e2613c6b86236e2948c6f",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js": [
-   "a3fcc35f7bb62b57aa50c63f4746fec35a115389",
+   "94b9678958bbd4161b8d96100695aaf1230050b4",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.ideographic.html": [
-   "3f0934176184909aa5f8887061b0cf45fde042e1",
+   "d6ce08d7a214dacf7d06fa2c5b6f7620666e3ab6",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js": [
-   "5cb8eb0cdda08696d2bf36c1954c039af3e808c2",
+   "e8b1f49a52841394f0e81a4ee413f90c7c9d7ccf",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.middle.html": [
-   "f0407921221f2223809ace49d5e9b8d206ca19ad",
+   "6d17bf33cbb45bc621617272e14913d10dbe24ff",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js": [
-   "0c292040a9efafb6dbb90ee1239e3651e26d2ead",
+   "ebf012edefeff6b004e8eeb720f98ec7e7bb341f",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.top.html": [
-   "902ed1b3aa61d2372ccc4c7f9655b0bbb953b99e",
+   "9df9206e22b8b0bb3d5282332b93f0e4a33f366c",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.baseline.top.worker.js": [
-   "a2427ed54e784201efdadba3db1e2679e2d122ed",
+   "9fa14e6f291013218575249936d0fb3b75fcbe46",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.basic-manual.html": [
-   "9ca033ee6353d6cac77428d1b38c5453809c4782",
+   "b83d8ede85e5ce9d4abab1b2446d405f75a8da00",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.basic-manual.worker.js": [
-   "d86348814c06bb61648ef8780073ffbb39ccb201",
+   "2319b5c3922328a2d2eef55eda94da1984f2ae43",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.basic.png": [
@@ -678768,35 +679052,35 @@
    "support"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.html": [
-   "3c7ddaaa418150b6b210268ad114b76160378677",
+   "1ef095dcf1ba62c1195f95ddaa8801e63a11388f",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.worker.js": [
-   "4e67325b0057fe155600674db3f9e00876c672e4",
+   "7191fa963c3dba89ab2e084b1047bb9d5089a504",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html": [
-   "ae4b308f21034545d95ba7df8f2c82622cb6f816",
+   "bd941cbbbf58bcdfd630f5bbcbb82b296d7ee03b",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js": [
-   "08133467076a881353eba059cc225d2e3eae46fa",
+   "8482b2623dbdc4fc4f2caf584c851c9e42225656",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html": [
-   "b7d4cd63d4e87f226dcb4a21bdfa296bb19d1346",
+   "bc85c45fc948ff165d4d3b496fd8fc7e423aa157",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js": [
-   "6e76ff6fd293dee7e207828f209d22d657be89b0",
+   "2d205a92fc758052304c7125e75584dd61af6ed8",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.html": [
-   "669df5dafe29271ee7db0fbb6ecd2656e7501e15",
+   "a5b887265727aa85c4d9f3a25817cbbee810ccea",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.worker.js": [
-   "1eac193307963f6ccfdad9fe1b4a8fbe9616e11e",
+   "3450446a11586be99b83a1eb9e67fc59344a7669",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.large.png": [
@@ -678804,35 +679088,35 @@
    "support"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.html": [
-   "fbe920c87c88ed38d15bb2ed7ac96518174e3a89",
+   "2939a95bef1a0b0c83eca5a642345bdc1531e6c0",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.worker.js": [
-   "fec72292ccffb6ae8a7cbcf6d8d105573c6e1024",
+   "a7a89fe866951132396df46737a537664f1b5350",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.html": [
-   "00995e75465e425a494d509da638cf9b7d92a9a4",
+   "319a0cc84e75dbe0f1be7a28fbf8f1ff7d975a92",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.worker.js": [
-   "fcb09250f5f9d5a0273dd88433d191b18c6c3bcd",
+   "6f10788535e3bc58f0aa434009beb1c0cbacf8cc",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.html": [
-   "2dd17d790f20f305100dfc35ddbd7a924ab86f19",
+   "bf9b0f24951711d20eb8f7af89876acf9070b476",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.worker.js": [
-   "442a921192c5649c586bebd5bec62fe955e27d11",
+   "e52944e955a6dd0e4c210ac10977eb051810cd57",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.rtl-manual.html": [
-   "ddbd1ffb75888063243b0d769df83a0f3d4a3329",
+   "f80a891c2f279f5333a7618cf756f2049a9512c4",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.rtl-manual.worker.js": [
-   "c7be4f826ec7d606ccc89fc4e916b141f2557e1e",
+   "3422e835a6437b39e7a29af5c07d23eedbd8e92c",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.rtl.png": [
@@ -678840,99 +679124,99 @@
    "support"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.unaffected.html": [
-   "7c46db0f692be715403dbe791e623a87e6ebf787",
+   "e7e71727f7f7f8c7ad2988f77c5fee83b17eebee",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fill.unaffected.worker.js": [
-   "bfd182e8b4ae9b39bf36b1d06f14c3a5fd587df2",
+   "e90aa3b9f7980a915a6c128e361daf9f2bde7ce3",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fontface.html": [
-   "77994dae535084f8ad5e03d37e0fbbbf6a4508d4",
+   "099074fa70c21ecc880abead186b57746e780593",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fontface.notinpage.html": [
-   "d2bff84de5d0ffa88547c58920f296c196f34241",
+   "df319696e2ad509d87600435ff111279f17a2743",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js": [
-   "bfc6a74dba18198654b4643dd18b1ed03d7f1076",
+   "d8d5aa1c2a0e22ecaf611a47a131cde59f189882",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fontface.repeat.html": [
-   "b2a846b61512fffad62a4a7f4b4824e687a31f17",
+   "9bf37b80aedd3358a206e6530f84deb672c7e255",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js": [
-   "5e16af795072fe39ce08b7d6633ad0be75fb424d",
+   "5fdc5af4b71dbf9f710c44dfc9ae7c5c43ee2c15",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.fontface.worker.js": [
-   "ed9e36ae86a4f5735844959f1da4c5fc4fbbb799",
+   "115cbf2d11b75bfd199e467ff2fe5764b4fa4938",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.kern.consistent-manual.html": [
-   "372e61385732b20ba0705d9ac9b5ad19be31ffb8",
+   "e6c209a99b11ea46d57525b4bd16658036fe7303",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.kern.consistent-manual.worker.js": [
-   "8bdb213a12bb2e8025d79e6195decbd8db342183",
+   "f7f04765d09351b2fa8bd39daa19fea20c46f96a",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.space.basic.html": [
-   "8d3ecedf94ee5c4f3394ba7e59a2496a1105fb5d",
+   "24cc42d613837c4764daaa05a409040386aa82ca",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.basic.worker.js": [
-   "1a6c231f2bca5418c8e85b79bea2ce4b8240b46e",
+   "48b37e93a9cda22b2288494bb6c16d9232cb98c1",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.end.html": [
-   "1b84bf0893b90a8f57cf2ebecb731a7b46da6aa4",
+   "488c5ebe2597f0087ec8cc731a46a62049bfa8ab",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js": [
-   "58189f3a771280d561a6e8df65cef56497a696a6",
+   "1ba48cf32c509627aa68eb412f1f9b83876dcd5c",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html": [
-   "5e01afbf59de97e32dade96791024ecf16cea001",
+   "5adc6ce7bc077c5c219ce2a3d25c83c603fda724",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js": [
-   "63e98d4ac8209333e428c4183897ea5927ce6149",
+   "5c5ddd9d69c049e1111414feb042d35361e1c650",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.other.html": [
-   "4962f3bc86c4d07634454f1ebfc6bdc5cb545cc6",
+   "38baee129b7c9acb1b1a437d7d24d60be1305616",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js": [
-   "66fe2e76712172c4f4e32f498a3deb73bb2516f7",
+   "1b687c7bf4915f6f1c270102813ddaefe4b55bb3",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.space.html": [
-   "a2f788bd64d5db8964ed5bceaa8b28f3ec76db4a",
+   "7f775a950ea0dad1badf4059b8d5790558e79236",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js": [
-   "8b002f52955b08d6233fced71d33fc9384db94eb",
+   "f4df16c2897b3dd00a7c0bd299ff4cce56fa2bc9",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.start.html": [
-   "806abc861b8b145f9ce7225cb393d1bc5abb8281",
+   "ef20d357d5c85661dc0fb7509399e1aa3bb2c0d1",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js": [
-   "076d7e4c577d9636754767083eed9ccb16bdf094",
+   "549fab0b46ef1f4a3c4266c9c29514b5af9f615a",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.stroke.basic-manual.html": [
-   "510b385b2c9306b62ac009c46d40b423fd43cf02",
+   "73120bd4226d8c772e68b8191df91375d0c25210",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.stroke.basic-manual.worker.js": [
-   "680cf3b18b69e370ba0b5dcad240d1cdb9b46932",
+   "4da0b5dca35896177f0072f3082cc84751f38dd5",
    "manual"
   ],
   "offscreen-canvas/text/2d.text.draw.stroke.basic.png": [
@@ -678940,459 +679224,459 @@
    "support"
   ],
   "offscreen-canvas/text/2d.text.draw.stroke.unaffected.html": [
-   "e64415496f7e05cf0697602b7dd6c440e8c9295d",
+   "b0c755469f97827d6cece80908f28bf968bd61bd",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.draw.stroke.unaffected.worker.js": [
-   "90e0feb0ed58dcd86e389e4d28441e81f5b8507d",
+   "87236552eb165aaddcb068c6c06b83efd8b70659",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.default.html": [
-   "19a89d007042be789c3cae791e4483ce83154520",
+   "800c7c98c763db974345eefd103be1fdff0e7ced",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.default.worker.js": [
-   "94ab1be533a2faf3680908ee79db1e62beb35e50",
+   "138670ee44366cfa7f9580b6ae15afa5c7958735",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.basic.html": [
-   "4c61e6e4d21c86393666fc453cde2118ce1db92e",
+   "68685e18b583842724cc1d1b1a8afcd1204f30d5",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.basic.worker.js": [
-   "7179144118569a56297f18fe1dfe532a35c81ba9",
+   "e2590dcfa755285a2b5b70768415609a5bd91dbf",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.complex.html": [
-   "34d54196653b3e07355b14d356606a1df175140e",
+   "cb62da00ea1733fc800486c0c3f95338f50d6096",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.complex.worker.js": [
-   "958af64768bd2c1a67cff445b152fe4fe0d3823e",
+   "c094dbacf13b00ad43f09fe45c9500781316b5e8",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.invalid.html": [
-   "79860234a56450396c530a901a5ce4691fcbedf4",
+   "b72dec5816a03cb83c2c237c025073bc6b1d9888",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.invalid.worker.js": [
-   "9be1a6d6a845ebe194e41e985646c52d7e676a15",
+   "3d52837fb5de36675de73afdf6d00ad7824229bb",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.system.html": [
-   "49adb4c383aaccc81a01c05ced3478f454596dd6",
+   "df7705c1c6cec9bb0ef59438417dd48451ea5f2d",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.system.worker.js": [
-   "c05ca6a58facc7a0f7b2fd9eb4cbcadb83197aec",
+   "bdecbb13ea784fd7335357abb544e9e039dc8a70",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.tiny.html": [
-   "0b39dc64036490cf2d3f2ce6751d65a0dd5c9787",
+   "abb1b1a15812f613f8078a335d83ac247c17ae39",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.parse.tiny.worker.js": [
-   "70c864525fdbfdcf226fdb082067625353aeeac7",
+   "be1841b986b6cc24a3bea10c79113d6976f0f55d",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.relative_size.html": [
-   "8bd0d6385b6838ff55b6ccb4575bc6bc9a1fe105",
+   "ebe3d2d43e0f19e9d8feb8331892f977388f6c8f",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.font.relative_size.worker.js": [
-   "09d06e6c55deb87c5343628e5d2ec9c37b41dbb3",
+   "470c54faaf0991099a1745c1f468ccb077f4bf40",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.actualBoundingBox.html": [
-   "e7809e3f6c13e79de0fbf0a13a122a7c07fdd8ef",
+   "95b2119d9e383cfa8ced4e9f56cb0c1d5960d244",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.actualBoundingBox.worker.js": [
-   "0715cdb44be2789c5dec1152a9ca3d61dd01fbba",
+   "22a5369a20e2ee44dea77dcbc774c322fbe4246c",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.advances.html": [
-   "40104882154176e0c1d548e434a9912ac754f26b",
+   "6f4e21de95ae2917c6b3b3f5f20774c018227acb",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.advances.worker.js": [
-   "575ddec03d956282796c5277b613bf276230f75d",
+   "1a2c66f051ffc809788e78c572c13fe36337914b",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.baselines.html": [
-   "bdb6d1191395b47326d2000972b1c1ab1da50f54",
+   "fd26c5cb3d0de3df2bb1a6d3a3ef8438f026a6a1",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.baselines.worker.js": [
-   "04b033e14cd9a305babdc0a315400526fc9ad4c0",
+   "d1c2dff8c8043a9f94865665606dcb65f560331e",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.emHeights.html": [
-   "62258ad713c5097140d1ce48036beb922712261e",
+   "a08c2ae7dae2ab5bf58e0d477856c4b918d191c1",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.emHeights.worker.js": [
-   "6f073bd39136755c6fadec2810447059924d532e",
+   "bf576f2c4cd64a3102ca825142b36391f2ac066a",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.fontBoundingBox.html": [
-   "6133ec67febee4421987787c3213e9091a543acb",
+   "79027720358980be3aa2d1f4ced7cb4afa2b55b1",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.fontBoundingBox.worker.js": [
-   "cf64d653b30824a9b919b44ac5efbecdd5acabf6",
+   "018ff33c78812d5074a6f9ce2f3cdd66c640f149",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.width.basic.html": [
-   "0adef6c557786624c810112de4ad4cc6de555be6",
+   "6ace944962accae5c1bed54fc5c511d2c4abbc6f",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.width.basic.worker.js": [
-   "fef71b34f4eec3db6757a0e1bfc357f3f7cf0cf5",
+   "da2ea705b4d9a71d7562a87d5a1fbf1434b6e847",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.width.empty.html": [
-   "24cd14bb20d19df47b6aa10c38ecc1bfb08e57ab",
+   "e8c0b544ac452c8a2a10e286f673be2bef03bf8d",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.width.empty.worker.js": [
-   "cecd8ce5bbf0afb743bb21bf6cfb3f1c0d7a904b",
+   "32f91cda9663f11088a1d41a6ccc8a399dad7d2a",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.width.space.html": [
-   "0d0fc3cf2d1c193afea182a35c6a42deba7dc195",
+   "30a73cca1a42c1a552cc031faf143aecc807e67a",
    "testharness"
   ],
   "offscreen-canvas/text/2d.text.measure.width.space.worker.js": [
-   "ee7e071bddd79b20173759715ec33e32e0ba21ef",
+   "60bffaaa7675cbdebaa9c26f269a803ab7dbc37f",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.html": [
-   "fbc479d40170526b47eceb8f994606f6d1547ae3",
+   "b9553872eda8b5b916053e963e3071dbc6b53cce",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.worker.js": [
-   "3c27d46e03af13fc02a8f35e5955e26c6bcc4db6",
+   "52722923b5d35616980939f00a019dbabc11c93b",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.html": [
-   "7c23f4be83e52b9bcef3fc1c823fb661b96a04ac",
+   "386c3c2c898e5d50c11a854faa3ff5ca7496a98c",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.worker.js": [
-   "918199bd34153c2488cad97fa81589ce07b2f71d",
+   "ced10aca288749d7ea4f8e5c823b6c841b1685f9",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html": [
-   "ef10480dc028db7f3058c59643b588bdfa711a56",
+   "1d7e862c23e6fe46d125d1f73b75b1c5da2720c6",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js": [
-   "72d324b83aa5dd3604eb7383cc20be19c12f85bc",
+   "4727798e86faa5b6acd505d284b1b038b58fe842",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html": [
-   "fa0c7d32dbcb9dfe3bc44659aa232ef733c33d9e",
+   "ec31c63daa511b7eda16487bd28bd18444234c81",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js": [
-   "fc425e88e912c8ab531d76b59ac0b6874a56e555",
+   "1e04d845a361a8e0ed05eea5168c7d988b357d19",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html": [
-   "47ef7287610c63e60054a112e2cc4d6ac43225a4",
+   "360905d26b518ecf70a4348997078dc69115d032",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js": [
-   "04141b96c80c1463e0070815f20795c98df1b2d5",
+   "b8a970df73806f7a17592127c268f909069444a0",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html": [
-   "708e059aa21e336341d943f61eca6c4ee582e8f6",
+   "60c2482a41d8a93e1afb407799b058a071d4fe42",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js": [
-   "c2deb7acdd848271898e5132fe9a9d9a01b36c31",
+   "9082b02d69a14fc02f5f7ae2b6b8477dc69d2360",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html": [
-   "0211a88a64d852e22dca8226a61388f6627bce00",
+   "347434acb8a6fc1754dc5f6ec8a01c4e75f80489",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js": [
-   "714537e7393a5d665b368c8521f4a5ada0b25ecf",
+   "997ce8816be41b17aac1c329cdebbfd226af06f5",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html": [
-   "1309111765599178721fef01c90bb5c85bc5d2b8",
+   "f5497e6f33ffa03a2edd7ebd57eb9190904f6c4d",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js": [
-   "02bda8ac09b26b1929e4f303292e18514f9c3fdb",
+   "3aa8ca20e7ada23d32a7dd48cb56094ce4c75fe1",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html": [
-   "d579e74d714341b362f3f7c02036b9ea5bcf5a58",
+   "ec86c826aaf2c9ea18f31e56f414272c42879c17",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js": [
-   "608593c8f9d5e587798e978e9aef42affd028647",
+   "a1eafd6d272395ff8ef4ec3b46bcce02a24cdbe4",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.path.html": [
-   "702be9518cce1d1cdc9cde7111c97038181f0274",
+   "1ee5e5adb3c53ec3cfc67317abb5243de0eab141",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.path.worker.js": [
-   "53430287f335bf05cdf0818e9dd983cd73206d9e",
+   "0dc2e8a8cca1eb90e870b68d1128faf828a41284",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html": [
-   "403b0c29c5afab4ba4aaedb835f196b343775ab1",
+   "170d30ec8c4fbcb46114fc7586308e0f53c87876",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js": [
-   "3bfed141f9a6261e188c6f446be319ccb3467c9b",
+   "7af579924da3559098e7d4f1a49f5b12379045ee",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html": [
-   "d62da58a48d1081da52c7cf5bb4e5045eda49b87",
+   "9108d0ddbcf6a3a51377e1b89eb8719b38175b69",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js": [
-   "ac23acf95ae6596522804e84af47ee47647f472c",
+   "fd3583c335fe39250a52ad23a94134657ea2b088",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html": [
-   "4676d35f63379e93d1f7f4098c187be317fc63ce",
+   "0d3bf567309ab72bb0f226d5e84d8a7cd839f5cd",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js": [
-   "564907760d28e5e5d8456f042010d1c3efae9d95",
+   "8c58200a9d30d7d341c38eae6db93a34b1eab2aa",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html": [
-   "a0665ada462a118915cd5abab0d83b0fd28cd3fa",
+   "9d6fb4819f415200590ad6a2e08c72ca14f8ce31",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js": [
-   "3dcd6324d5258d6956c00b136ab9cdf754122bab",
+   "27b1804e00d231cfd428488f502e072ef7f132ec",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html": [
-   "5bbb3b66cf0c058505668ab866a483564f7d75bf",
+   "a41db9e4998ca3c97ed1577fbb2dbd1c4fb9e434",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js": [
-   "aa20af37b4b514de7eec7277f1b6570d85b314b2",
+   "c4ab388e62e2cea1e8036fcd38a2a33a6c440de5",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html": [
-   "591bbd3c1d4e3c695512a2f8962430074825d686",
+   "9553177d4b81d8c9112d9c183d12dab97904e7ac",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js": [
-   "abe66e2e426fb602fb92185ccb1861fd0903a4e1",
+   "67ae62dac8118cc8edddb689556c337d65c9a7b5",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html": [
-   "4df4b8b81c8e322fbfd5e1497e5e7969952f8c86",
+   "09b92bb78d4dd0191b48247c9506d064bf21237d",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js": [
-   "eaafacf02f62d584d2d6ee947759990b0c35c236",
+   "24c47f7b0c344431402837ee6cd5e709543eab61",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.html": [
-   "0d34e61bea88a5373f8113c18f9a12d54d799908",
+   "ba1aabd940aa1e5ac48585cf1a30966235be061f",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.worker.js": [
-   "f65c59eddf142d3becae1d54596c5414767ff07e",
+   "224039e698a8004c047d3879792e38acccd23d89",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html": [
-   "ff3994cfb0810f9ac2183966d73ce4897de0e134",
+   "2dab6e8c706ca245dfed760daa695dfca5ebffdf",
    "testharness"
   ],
   "offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js": [
-   "ded24a862bb9ed0ebb9edc82700d7346e3f59999",
+   "f38a95c4f1661ae6c801e221f700e3d7b750257b",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.html": [
-   "33a3c595041142b4de2f06ef75252b084a0e47d0",
+   "aaed40136b1c6e7478a82d4e90526c28025fde77",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.worker.js": [
-   "fc914a4987e96d8ea2dd22a463594010a98431b8",
+   "d991b1928a13f0da38ad9b5f4eedb14cbc5b5ef0",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.html": [
-   "808371d4b0fb0bc72bf18438f0bdb2c2c350692a",
+   "458d349d4778f14c4672ff86e69ba70d6f169c9e",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.worker.js": [
-   "0a9af42ef00823ae8fef344852cb4f073c398161",
+   "3f5fbe269bf23039c1b6ad1fc81c8c3e76e1e1c3",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.html": [
-   "c2848eb9b181a071265b405db997a851afecd863",
+   "78765fab835f43746fe673945d064fb125a188dd",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.worker.js": [
-   "4238493f73f71926cc65b7284ebb7e2d83e24131",
+   "f61cab832c87c303250cf204727b65311641c165",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.html": [
-   "f2120ec9d81c045175d3852e18a9bea92a88c5aa",
+   "ea209dcd11249bcdd9f2d50faa7c52e0707ccc6a",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.worker.js": [
-   "aa95095203a4d9354669231d3c7d1b4540e23731",
+   "c751760afd18ff6f890a3c9580545b5027566272",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.html": [
-   "cdf84a5e56476a0265e2555a2d9d199ab3820b6a",
+   "6b6188bfc0996719375522befcaba4dc56c34ad0",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.worker.js": [
-   "22fdda6db51033378a90c13798f76eb4fa76c623",
+   "53cab62995fb21fe457c4c7138eb40373d698406",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.html": [
-   "83f4bf0ad5a6bdd7aecb026ff228a5f139886caa",
+   "913795832dd8d1be48166caf1bd03c56e4e8e1cf",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.worker.js": [
-   "99e7de287edec05a4f02bdbc1a5c29ccb487965c",
+   "3b311526f06d7b228fd9ce1cbce19bf93a16d85f",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.arguments.missing.html": [
-   "9c73224f0d1a74eca08a40cacc90b814ecf335dd",
+   "ae8dd692148b3c762a581b0b76e603513a4b4717",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.arguments.missing.worker.js": [
-   "356333464cdb8ff57b70f34a9042e61b94be9842",
+   "9dbd97c861a2857a3032680636d7d927411587a7",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.casesensitive.html": [
-   "a344c69e11a5efb0d6050866db7e49e46e34f7e4",
+   "56431e2e4fc6c24430f54a736dca258b57f10185",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.casesensitive.worker.js": [
-   "3fcea3a71f8cf4227fc469ae07ff14886d311250",
+   "b41c1f767f538888104ecdc5b3b4a98bb9dff8b0",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.emptystring.html": [
-   "4b829c736349610caf0d8268dc6e1a635b283551",
+   "92f37506eaa44c23b9aae9bb752eff12af69adbc",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.emptystring.worker.js": [
-   "bce1106fa25184156505b676230768c9532f8729",
+   "54406bb5bfe06aa01c748f2d044edc91741bf256",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.html": [
-   "3dc2ad9edddf4b41f12a4cae60e92791a4a6099c",
+   "8e846714fad82a2824ee2c61d4cea1a71efd0470",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.worker.js": [
-   "e9a961d8e316821b4b9504762e79d131dcab99e3",
+   "855f997118b8b36d571fb5760f687b0957742a3c",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.html": [
-   "ced3fdee97324f24ca06b823c79620530b5377da",
+   "5511c4f21ec1ea096937d6c709c0dd7c9f29fea3",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js": [
-   "f80205b56d7ae888955d9ff8666e1e675248d409",
+   "c56ea7eb61538fef00e0c75ddeecf642e23b59e1",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.html": [
-   "4df8ea93da2db959fd8ed79fb69f946527a89cec",
+   "b8660ae7fc6da28bedbfc14fae1808f286d89807",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js": [
-   "e241fdef9f8274875376eb9ceee07c7c8b6b72ce",
+   "efe45b9196bab91bedc4e238b5478837c6a474a7",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.html": [
-   "8a542081479a9bfe124798b803ea7b469c74a45f",
+   "89f2655d5636748bc0e13c360352aa44d9ded1b2",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.worker.js": [
-   "451c2ea5bd266bd371f7c13ed6a750fbde8c121d",
+   "a533117562d6403e52d5d9ad3fecd2b499344025",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.colour.html": [
-   "5d36c7ef67d9c965c74487beb47fa3a763b674e2",
+   "6dfcd7a2f0fadd394250715539e730362967f6cb",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js": [
-   "847c3c373793667f2a98d389480d5c013437650c",
+   "24144657f8baad1f17d52b1e1c4de7529ca42f54",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.html": [
-   "8406dbb3d2ffeeef5be77359d7babc86ba038dc2",
+   "d54d01b3861acee6bad03b02a7f1024c0ac75e7d",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.worker.js": [
-   "37082d270e41c83b1ee86f85d8f883c7c750e2de",
+   "7ff0a0ca9daf1f390425f2ccdd041ef6d6103787",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.clip.html": [
-   "eb25f539e8c43f933059e115adefd0bf8c03e9b0",
+   "b536e8ced8d8594518465ae9b0ef75dd0d991ec8",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.clip.worker.js": [
-   "a0e284415549011ffeadbc3bb66860aad1b39048",
+   "c6e06ca0d015deb90b8de9cfd5bca9593db6a0ff",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.different.html": [
-   "b3eed9e013b1f9609ce8d5f75ce33c832778cf36",
+   "45ffb6974e2260df79fae44126a1024683e90cf4",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.different.worker.js": [
-   "3243e93b3798b029c96c593d67d176deb4b4ddde",
+   "206ba672fedbaabf772484809501d6295b9f1a03",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.html": [
-   "97d7654b11a8b8b2bae7607983bf2f4be0f50049",
+   "1dce8dabe584d1dc7367fd2c0f4823a42310291c",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.worker.js": [
-   "7ed02a15ecad9473afc5660d3cb59cf7a5649454",
+   "97b0b1a5ccee3e82099e93685f0b1a3d7d633753",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.path.html": [
-   "c767a3cb9726ecd31839228422d7b9f2584db1e1",
+   "b9c4ab57177c8fbbee40483ad04fdcb908c9d781",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js": [
-   "7a75feaa0a526e308215292188ab65bd141561f3",
+   "24e7d3d01d28640c2de83b791f1379f931bc7d9e",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.html": [
-   "9ba9f9ed5f66830b148e23b92a374de34dee6db4",
+   "a8a4b769e24a97767d2ec340118728d58c85dd65",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.worker.js": [
-   "4c94691f509c457626a709bbc110b8977d876a11",
+   "09c3d7540b715eadc0d37169e5bb366d79b70da4",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.same.html": [
-   "ed9260c728bc59d0507b84dd9326810b56c77d1e",
+   "36c3fea0f1eb99fdd931832c99dfb81a02404e50",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.same.worker.js": [
-   "aad9ebfe765fdc7fc43950321101f4df2f0c7786",
+   "cc202b485b716e2e725b0ce4196177fbc6411e82",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.transform.html": [
-   "8686155d5cf6abd97586b5af9177bbe9813814ea",
+   "a1b52e7db0a90f9cacd8da8a6b967e9f5818da94",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/initial.reset.transform.worker.js": [
-   "0022c78ef3f20b0f96d38d8424a772a1e4cad307",
+   "4bc45d003673904a16cd8fe189bf7d865522b3f6",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/offscreencanvas.commit.html": [
@@ -679448,171 +679732,171 @@
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.default.html": [
-   "bb378f2fd6a07a9d16a1c2e9503ff4edfb2ef2ed",
+   "da1997cfcc02326d841ebc76b4767673a3962cd0",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.default.worker.js": [
-   "ecdc53d495c6b21f9504f677e8f05259cd9995ed",
+   "020885c97119a8c9f7c6fb07587bba9d139d0326",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.idl.html": [
-   "d422aabdbc4496653bb7f8cfc496a46a26b2a7aa",
+   "e4af962896ba57f161890e5663008231739c4a00",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.html": [
-   "3d41dc4ee4a5b6760f22889005bf148a11ff3656",
+   "b03ac63a7f730fb4f42dda31f1286b082dd08f3c",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js": [
-   "7482e06d2aec183d7434b66d34508b4c78263e6c",
+   "f70b497dfb694ac8c009ab520dc18d92863b48c1",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.idl.worker.js": [
-   "3846d6d1164b959a0cde677e05f889b654339325",
+   "79e9530f8929332f078ac1599e666d30fd4a2acb",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.html": [
-   "e952c73c88ee990247387c25df3ca02fc8033473",
+   "78f21aa3032248766de1e22fdebe80acf558e06d",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.worker.js": [
-   "b9d9ff985606a8ba55621dfe4d99e4d03be70b8e",
+   "e9e1c5286395c0ff0ff93b93c2f1f9ff05c346dc",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.html": [
-   "2c0298620fa4cd6f7264bfdbba256e1436327305",
+   "0bbc588817692f2f789d62b29d34dfffad889a0c",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.worker.js": [
-   "2d1a9fca2821c2a4bf5c918bf89adf21ae48d2c6",
+   "efa88f0f437db74021da971e7ee527df774ef24b",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.html": [
-   "1bb5f6849793871771b261b6157962bdf2d8235a",
+   "6b403e6e54ed9124a30e6fdfc8232cbd14d393ce",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.worker.js": [
-   "07847d83efa0764d78ea6a9b70d5baedee09344e",
+   "7337ee41930b939350a0b259b33258d97710f93d",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.html": [
-   "481bc9f9e7115fbfbf488686713b2612326611a4",
+   "445d5ba61d27528bbab7882e2e8df8fd0b47840a",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.worker.js": [
-   "a31a7bfd28dcd923dc76dc4d5e0bf46fc23d8220",
+   "cf56eac6b3dbf5c8d0bf660d959c92b31702fa93",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.html": [
-   "29f298465ad64e29198ebd639c0a1e8e93ebe5f4",
+   "db7f3217de5a4e1017801c9ad232dc57b849d0bd",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.worker.js": [
-   "933d856f8ec445664ed4460aa9f8e912dcf08319",
+   "0c3d9b9244d6ea138128fc5735f2da7f4c859904",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.html": [
-   "6263cf8cb588b4458bcc0258536a6386b43d8656",
+   "0a953428b6566c90c674674022060bdcb2012047",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.worker.js": [
-   "ee95f10a5912a3a4ae634968ebb64c987a2df78a",
+   "c56e76d1128eb5c76dc14854cef3cf2dcbb1d745",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.html": [
-   "d6af82d39dc72fecc69cb3b18056005473bbe9fc",
+   "d5ab800f89d0a7e8f9417801b56237e4a99a5c4b",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.worker.js": [
-   "bd7a366bbe089c244ff391357f05fab5153ecb65",
+   "f5c8ee2737bc5b49c2ded77a78178cee4a4f4daa",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.html": [
-   "955d4d22225879c96cca11a62c9edb393db09876",
+   "ffe7df390716b55138b04643b66c35957363f2d2",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.worker.js": [
-   "bddc3db142cc3f3220ad9c16700938050ce195b8",
+   "6e0a7b0f800b39ebe4b23766e012e069e3d6041f",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.html": [
-   "871e431ce37b6b3bd0b9e1eeb07e3b18fd3d6d49",
+   "424c77ecd2da08f4e03e6e6e637568c54b5ca78f",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js": [
-   "e8c955298910ba1fe844b429223b7544813cc6ba",
+   "14860bdc6c7c906adf2967a27fc87af55aa95dee",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.html": [
-   "9c8cca111be44c7e79190f7213cf8e40ce487b2a",
+   "4e98d7871ca0210ca0fd391ececce1e711d1e0f9",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.worker.js": [
-   "b48ab71f7600e476593584fc835a67b1d625ec6c",
+   "6e2b995433f53f5440a48c31ed6dcb8332f29c16",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.html": [
-   "02d7dc75824b971ce08a53e4be7346e539a6598d",
+   "99b3155e858c4b5ef43e562605628ebde964fc0a",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.worker.js": [
-   "4c6ad634175c781d71f0ffd5dd24b0b62b5fed42",
+   "da716641ff75877ee2cb12b9ce20eab6703a3822",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.html": [
-   "9360753adc43ef2ce036a2e71c0ad15728738043",
+   "200f028dcc7f8de88bce1e4642b006f22f4cba48",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.worker.js": [
-   "5bdc1a22fddf9a2e6006ebb03c76153e7a5ec36a",
+   "812b2503ae1c1067f5ecb928cd76ba3e81525b7b",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html": [
-   "21562d2b110739d612ec23d35ef0af5dfdb3d8ef",
+   "3769448de3cdeff83f00a78aa12bf8c4fd617d03",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js": [
-   "f983af3a9a1efc636a1fa7f9321762d72f8eb647",
+   "2b3e0db5a2b4158ea35eadca26cdf4ce22f8e87f",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.html": [
-   "c73f616a508bd6148fba3439a68e42ad7bf42786",
+   "00ef9cf41d91cc84e3cd5eeb46b2e709323263f7",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js": [
-   "39ccbb5a5d4be9037b53d16e927c9a78687cbf5d",
+   "f46beb3f5e553823ee0ded71532f484f7f1ffdfe",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.html": [
-   "b935ff588cd3b6e76f3d5e66da1301eadd1688bf",
+   "03b20eecd0c45cc2b982b77798926ab943c5c80b",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.worker.js": [
-   "d7f60d8a780f1b08cbb3a776688fa8440966590b",
+   "26eeb9826de52f2439894a4e1dea6e9c3800181e",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.html": [
-   "0395fb360833f8505d56a8935b1a30b4c1d3d5ba",
+   "00049584416723735cd155ecefc2965d536f7524",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js": [
-   "c9ad17b1883d0a886c29e00b7d52be1152143e9a",
+   "758015f43fb2dafeff117ccdee7fa1584d469136",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.html": [
-   "9dbdde9b29a5f8a4be0b84f148d6e8768b9678d7",
+   "e88a241e421b30acb3fcfce50bda1790d04e07cb",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js": [
-   "a5b94006fb7b5da219e021358049deb934a8c4b0",
+   "83fdd60d648d8fb68727ddd23a24f9b20e98975a",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.large.html": [
-   "2531247c40b292c9b6686b1ce84f31ac141aaa2d",
+   "4fcad4ab53ed14ca2132437d9e21442cbbd3c798",
    "testharness"
   ],
   "offscreen-canvas/the-offscreen-canvas/size.large.worker.js": [
-   "536d156e4ffccb2580a570c219d904ce987a3ab7",
+   "c2a0581607fce31878f5210abd4de8d4674942f6",
    "testharness"
   ],
   "offscreen-canvas/tools/META.yml": [
@@ -679632,11 +679916,11 @@
    "support"
   ],
   "offscreen-canvas/tools/templates.yaml": [
-   "838d8f845ecbd3f30109a3e81fe673a02e7bd181",
+   "15d37239cdcd538896e2cae087d98da8b53b6e7f",
    "support"
   ],
   "offscreen-canvas/tools/tests2d.yaml": [
-   "0b346bb658e8316aa070a0bf30376c2c0cc54c93",
+   "6662668f37397145e93eee51e0e4be80f170278f",
    "support"
   ],
   "offscreen-canvas/transformations/2d.transformation.getTransform.html": [
@@ -679644,179 +679928,179 @@
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.order.html": [
-   "8d70442f10814b389c649f49c3f1dc197d254923",
+   "aed92bf5cbb88d43abb17f9ae857734f9b4dacf7",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.order.worker.js": [
-   "9b47794ab7eb5b4c0c52c75c86d072ad4b2af646",
+   "7904fc44ce254bdf48c6d81be434ef5675cbdfc4",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.direction.html": [
-   "b4c54d21952af2e79be012d11cfff6225145035f",
+   "57b270935a74590381f17cec347e74533e32c0d0",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.direction.worker.js": [
-   "0488476a18f3b675bf0198547af216ba16ca1959",
+   "5fc873722e246ef507290ae17e9fa7fe1c237f84",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.html": [
-   "aabe38b17e96e0a759e882c34b6550fa6d6ad9f6",
+   "e1796c6675d0e5af55bd62cece82d27257353224",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.worker.js": [
-   "8824c70320dcc2a4642875e86476ae8cca9592b5",
+   "0f5883447013673ea83fb076242f8d5ed81628da",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.radians.html": [
-   "1feac42cdcd14b7c65103ec4adc8382d44403626",
+   "33b359e0504bed3cf15f8008362dba4bfb432f6a",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.radians.worker.js": [
-   "efc14c971a564d8683d01d3fd6defe5f72f9a2aa",
+   "5206c205bb9dcc79103975abd6abe06eaf2867e8",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.wrap.html": [
-   "bc49fd112110b9c05709be52392c8e329ba2f81b",
+   "c082426e30e191bdc2473fee89b60f411852f718",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.wrap.worker.js": [
-   "82d9e301e2ff7b0d3e35309ad954a403d8f34e2d",
+   "fa553f06a6d5f91459043fb28b71374df02623ad",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.html": [
-   "1aa434a39f68689c42be9da8cf1c0a2eeb8e0cf8",
+   "939eabcde65386330815bcfa73df8bdec5de57f2",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.worker.js": [
-   "1b4dd6b80d0e33e393893c0572be20987409a34a",
+   "d04b79f3bc574d4d166aa278a777262c9974bc9e",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.zero.html": [
-   "6ec806d4c4a627dfb4e739a137de5a4084dfd81f",
+   "930802723c9fc82188e0079aef76b38c58eceef4",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.rotate.zero.worker.js": [
-   "353f96925c48224eda64a43ab0655448729acbcf",
+   "5edf964f6c2255f8fec7414c35237d347bccdb67",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.basic.html": [
-   "9ab8d14ef03fcb08c5f65d1ae5e8231e6489ca6b",
+   "7d8c0f6b21ba6d9b646c8d454fc445eb60e0dbd3",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.basic.worker.js": [
-   "e585f5aeea1f8108d258090b4909b5278fe96fb9",
+   "bc7b5042ffd9f09202d3ff3c848dea825982eba6",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.large.html": [
-   "62e5d943358328382750f6b99d2990db3b2c27c8",
+   "ebef9ef83ca467a94312415ebd84fe7782f5ee99",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.large.worker.js": [
-   "9cba39a0b7c3be77fb975f04a15b2e55af8d5c41",
+   "412680e38a4931c4496ac555e097c6473a0d421a",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.multiple.html": [
-   "e1a99d94454654b0963d7f857778dff6feb24da5",
+   "c06fe61412975a10cce690fe1c0f296d2889ab55",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.multiple.worker.js": [
-   "98d8918067c3ca971c1a23245396b306a464bd72",
+   "8f1304cd1016581092166282f8f132316e58b380",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.negative.html": [
-   "ec478fb4785736c600ad9cc66b1f5f9a318488ec",
+   "2a18792741e44485e15e9a1719786a928b3d19b9",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.negative.worker.js": [
-   "d6555718b5751019ce1fa9321c2737710a3ba884",
+   "d697a25856bb90f656fa4d02085311792609ab2e",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.nonfinite.html": [
-   "20163ce43c7870b3603223a282489c48e8c2cbeb",
+   "144335e3cf1ae9534e5ad1c16eb698936ab90e1e",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.nonfinite.worker.js": [
-   "7637082e125b480126d429dfb82f2edb19463798",
+   "9dccadbac8b39c59f04edfe7fc304a20f90011eb",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.zero.html": [
-   "f0e84692cffa737d49b958242e24db0864f82ccf",
+   "95aa5b97a4bc9fc2884a202a95f91f2c5cc9da98",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.scale.zero.worker.js": [
-   "377766856319c4c36b4b38655e53044198823eab",
+   "6bbfb25c223135cbee1a0a2bd167b200ff3a29e5",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.setTransform.multiple.html": [
-   "90d4031e1e2a4907a800a456fe649150f8fee8fc",
+   "87eee435eb4f74e59801d50100f83e0f6577f7b9",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.setTransform.multiple.worker.js": [
-   "424785674cdf99ec429a06b29b2fa2676d25a3e6",
+   "552b1f9345a78058473e779b901e0901b33c53ad",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.html": [
-   "fa2fcaa913c0e0f99f9bc75525bd06d2c0e78712",
+   "46dd565a6823b6aafdd65f6e343e13ebf2c877c0",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.worker.js": [
-   "79c0acfd10df5452b2b964b804a7afc16c60e865",
+   "cc826335238f514080dfe349475850372a77b525",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.setTransform.skewed.html": [
-   "cf6df8232c7e91210cbab8ff59037bf0d9593b39",
+   "6c911f8a9bb720ffe8a6e64065b53d99c44ed902",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.setTransform.skewed.worker.js": [
-   "96b0e1fe6cb35e97a86f43dc13b93ede493f1afe",
+   "f731ecdcab0e1bb5b9a59cdd2f45721a71bd24cc",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.identity.html": [
-   "fb62cda1e4fa1438bc5c0ce5e09fdc658a02a6c8",
+   "5063959c8c26c8d9d35ecebb11db555e8f7b0d60",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.identity.worker.js": [
-   "ced3cdbbd0b8564f1ce7847ce14054f64eb8ed14",
+   "6b5fbdadf448f8ffb3834304d4981a12b068760a",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.multiply.html": [
-   "900e2e204f64bcd053e123c554a57af7bfa7154d",
+   "d36a5390e0247ffd7c5277db2888823bd2a261bc",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.multiply.worker.js": [
-   "253e45c0e8b98984d717e084043b3eaa375bc873",
+   "f613f328a896f790acb286d7d7c5571d03fb2f73",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.nonfinite.html": [
-   "6dcb8aa4c601f7e13d5c5a1a27b32e0b0b79e570",
+   "c8f27b874af4ee5e08310b3d700289d1436dd3cf",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.nonfinite.worker.js": [
-   "4b840886f1b59afb0962c8f8eafe8219bebf39f8",
+   "b062ca9cb8c45781703f0d1da685831a3bfc77b2",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.skewed.html": [
-   "e2892ab9968059e60179ba8f9ef9a844913f5b63",
+   "c691aa50411c02ec2eddc7ab80b4e1958d096800",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.transform.skewed.worker.js": [
-   "d17e1e3726c34095e3c4ca9d553aa4fb89e08c13",
+   "726fba7877fed4edb3085fb28d0afa01d0f74944",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.translate.basic.html": [
-   "6f7110cb1a93a5ddd7e4a884dfd498d0ab1efa10",
+   "0cdf2a1f9eac8a3e44b5a40267c23b26319e9120",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.translate.basic.worker.js": [
-   "8416af6848148b3b5ebea6c5c83df3055985f92f",
+   "5f6d0393b1a5c5497b929b3618a4c5e744648f27",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.translate.nonfinite.html": [
-   "dd6059670cf3d51cfa984abeaff4f4c5e009267e",
+   "d2e87c5e5c2cb756a951b73477a4845c2f927ca2",
    "testharness"
   ],
   "offscreen-canvas/transformations/2d.transformation.translate.nonfinite.worker.js": [
-   "53d01ad83c88ae0f5038718c505a9c37db2451d5",
+   "3055c58806872c85bc0ba241b062e718b75007e1",
    "testharness"
   ],
   "old-tests/META.yml": [
@@ -695936,7 +696220,7 @@
    "support"
   ],
   "resources/testdriver.js": [
-   "bd38e3e006afec94c23005cb1725c6d4a6e9bbe0",
+   "22d5ead72267a39b7a0b954b479e60ab6516ec9f",
    "support"
   ],
   "resources/testdriver.js.headers": [
@@ -701788,7 +702072,11 @@
    "testharness"
   ],
   "svg/animations/cyclic-syncbase-2.html": [
-   "f48bbffa8599ae0f83f7977707027b75396cd3ce",
+   "7e27f469e877829a63051ecfc17be7a63b125bf1",
+   "testharness"
+  ],
+  "svg/animations/cyclic-syncbase-events.html": [
+   "09d5c2e7b803af66199f8e08479b29a653f22dd2",
    "testharness"
   ],
   "svg/animations/cyclic-syncbase.html": [
@@ -701875,6 +702163,10 @@
    "56f67dc5ed1ceeeea347b703f5048b289f95131b",
    "testharness"
   ],
+  "svg/animations/seeking-to-large-time.html": [
+   "2f89200cbbc688dc4de7a53f8087c8a40791d360",
+   "testharness"
+  ],
   "svg/animations/short-simple-duration-and-fractional-repeatcount.html": [
    "025dd5092d3bb77707423b316f10bef8f2fb927d",
    "testharness"
@@ -706583,6 +706875,10 @@
    "a64ef3749211bbb2b3580efc2eee3ea5a810ea6f",
    "support"
   ],
+  "tools/ci/tc/testdata/epochs_daily_push_event.json": [
+   "0f74c315d237043b64925c0bbaaa3a5d954a0d82",
+   "support"
+  ],
   "tools/ci/tc/testdata/master_push_event.json": [
    "8e79f7537349a79fd70746ab6e371897acc4d5e1",
    "support"
@@ -706604,7 +706900,7 @@
    "support"
   ],
   "tools/ci/tc/tests/test_valid.py": [
-   "9480178206def8d1a5e4ee46798b123d7eab45be",
+   "d6cbfba4e2cb69488ce585d4db9064dcaa5fe6fa",
    "support"
   ],
   "tools/ci/tests/test_jobs.py": [
@@ -711776,7 +712072,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/base.py": [
-   "06b1012ec95f552d104b6f416342aa973512c160",
+   "c8a26d042ebb3fc8276b73f3520e8e523bffc7df",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorchrome.py": [
@@ -711820,7 +712116,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorwebdriver.py": [
-   "39346e805d735000e9fcf28fcaa72ecca8f34f68",
+   "8ea59b2577d0825080e1f425e33e114d62b695fb",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorwebkit.py": [
@@ -711832,7 +712128,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/protocol.py": [
-   "0758312d65f90043b1cbb2f536d3d31c71812ad6",
+   "1a47fa9f1d8cc46a7fe5b8657b20dea6de60b0bf",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/pytestrunner/__init__.py": [
@@ -711920,7 +712216,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/testdriver-extra.js": [
-   "278f226dbd2cefc284ebf347c32089ea1fa5a22d",
+   "745421f59bb5eb309633a3c3f482e5d0dcf86730",
    "support"
   ],
   "tools/wptrunner/wptrunner/testdriver-vendor.js": [
@@ -720592,7 +720888,7 @@
    "support"
   ],
   "webdriver/tests/send_alert_text/send.py": [
-   "9186e3e3fc22d49ea6175e6a95b90f11ad1ce457",
+   "e0fcdbf28a46ecc0ff03dbda0448e94a944d17d2",
    "wdspec"
   ],
   "webdriver/tests/set_timeouts/__init__.py": [
@@ -720612,7 +720908,7 @@
    "support"
   ],
   "webdriver/tests/set_window_rect/set.py": [
-   "adf265127c97e08da354b47bb15d2e8a9ef4bac3",
+   "32e400f46644fc0e5fc7349089395aa94b0253fb",
    "wdspec"
   ],
   "webdriver/tests/set_window_rect/user_prompts.py": [
@@ -726976,7 +727272,7 @@
    "testharness"
   ],
   "webxr/xrFrame_getPose.https.html": [
-   "71ca78abb48cf12cb41e8249289a06eddc7eae94",
+   "1f3e3765df4e0a4319ea94842f2368e673948c4c",
    "testharness"
   ],
   "webxr/xrFrame_lifetime.https.html": [
diff --git a/tests/wpt/metadata/css/cssom/cssimportrule-parent.html.ini b/tests/wpt/metadata/css/cssom/cssimportrule-parent.html.ini
new file mode 100644
index 00000000000..46090c52859
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/cssimportrule-parent.html.ini
@@ -0,0 +1,4 @@
+[cssimportrule-parent.html]
+  [@import stylesheet is properly unlinked from parent after removal]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/cssimportrule-sheet-identity.html.ini b/tests/wpt/metadata/css/cssom/cssimportrule-sheet-identity.html.ini
new file mode 100644
index 00000000000..a0f01d35e16
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/cssimportrule-sheet-identity.html.ini
@@ -0,0 +1,4 @@
+[cssimportrule-sheet-identity.html]
+  [CSSImportRule has different sheets even if referencing the same URL]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 18d39d1ef35..0f615a03436 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,21 +312,15 @@
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index ab9bcf18e68..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,9 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript error]
-    expected: FAIL
-
-  [separate text/javascript;charset=windows-1252  text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index a63e414f43a..536384f36e1 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+  [X-Content-Type-Options%3A%20%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
index bf50d59df41..e02f179ec25 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-innerwidth-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for legacy `innerwidth`, `innerheight`]
     expected: FAIL
 
+  [features "innerheight=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
index e150c9d848f..23eefb8eaf9 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-screenx-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for legacy `screenx`, `screeny`]
     expected: FAIL
 
+  [features "screenx=-204" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-204" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-204.5" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-0" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screenx=-0" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "screenx=-204.5" should NOT set "left=204"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini
index ad8840fbb68..940516ddd33 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-top-left.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for `top`, `left`]
     expected: FAIL
 
+  [features "top=-204" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "top=-204.5" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "left=-204" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "top=-0" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "left=-204.5" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "left=-0" should NOT set "left=204"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
index d1ed9088b2b..9027336b453 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-width-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for `width`, `height`]
     expected: FAIL
 
+  [features "height=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "width=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
index a70e9dbad4d..4e44584b123 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
@@ -1,32 +1,48 @@
 [open-features-non-integer-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `height`]
     expected: FAIL
 
   [features "height=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "height=/404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [top=0,left=0,width=401,: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [top=0,left=0: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [features "height=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=L404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
index 779531b4a98..fcaeae5336d 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerheight`]
     expected: FAIL
 
   [features "innerheight=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerheight=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
index 7a1b258d52e..42327fedd27 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerwidth.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerwidth`]
     expected: FAIL
 
   [features "innerwidth=405e-1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405*3" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405.5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405e1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405.32" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405  " should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405LLl" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405/5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405^4" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerwidth=/404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=_404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=L404" should NOT set "width=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
index caba4124f0b..a8e4fe06618 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-left.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `left`]
     expected: FAIL
 
   [features "left=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "left=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=/104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=_104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
index 9ace8a4cbdb..64a08faf0e6 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screenx.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screenx`]
     expected: FAIL
 
   [features "screenx=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screenx=_104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=/104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
index a82bd0f981a..4f22ef4ef29 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screeny`]
     expected: FAIL
 
   [features "screeny=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screeny=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini
index 10f617db69e..8540f53d8d6 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-top.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `top`]
     expected: FAIL
 
   [features "top=105/5" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105*3" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105LLl" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105e-1" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105.32" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105e1" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105  " should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105^4" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "top=105.5" should set "top=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "top=/104" should NOT set "top=104"]
+    expected: TIMEOUT
+
+  [features "top=_104" should NOT set "top=104"]
+    expected: TIMEOUT
+
+  [features "top=L104" should NOT set "top=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
index 28f93ee71b5..9d841e61bc0 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
@@ -1,32 +1,48 @@
 [open-features-non-integer-width.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `width`]
     expected: FAIL
 
   [features "width=405^4" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405.5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405e1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405  " should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405.32" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405LLl" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405*3" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405e-1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405/5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [top=0,left=0: absence of feature "width" should be treated same as "width=0"]
+    expected: TIMEOUT
+
+  [features "width=_404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [top=0,left=0,height=401,: absence of feature "width" should be treated same as "width=0"]
+    expected: TIMEOUT
+
+  [features "width=/404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=L404" should NOT set "width=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html.ini b/tests/wpt/metadata/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html.ini
deleted file mode 100644
index 6ff9d2e555e..00000000000
--- a/tests/wpt/metadata/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[document_access_feature_policy.tentative.sub.html]
-  [Feature policy "document-access" can be disabled in same-origin iframes using "allow" attribute.]
-    expected: FAIL
-
-  [Feature policy "document-access" can be disabled in cross-origin iframes using "allow" attribute.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 6b68e9094e4..8b743f36e1d 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,16 +1,20 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Non-HTMLElement should not support autofocus]
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.html.ini
new file mode 100644
index 00000000000..2ae05a0c8a4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.copy.html]
+  [OffscreenCanvas test: 2d.composite.canvas.copy]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js.ini
new file mode 100644
index 00000000000..fbaaaf54458
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.copy.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html.ini
new file mode 100644
index 00000000000..e86b216a620
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-atop.html]
+  [OffscreenCanvas test: 2d.composite.canvas.destination-atop]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js.ini
new file mode 100644
index 00000000000..420ca1b64ed
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-atop.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html.ini
new file mode 100644
index 00000000000..dc87eebd8d2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-in.html]
+  [OffscreenCanvas test: 2d.composite.canvas.destination-in]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js.ini
new file mode 100644
index 00000000000..d9d66b797e0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-in.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html.ini
new file mode 100644
index 00000000000..ad9e661caee
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-out.html]
+  [OffscreenCanvas test: 2d.composite.canvas.destination-out]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js.ini
new file mode 100644
index 00000000000..d7988098b40
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-out.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html.ini
new file mode 100644
index 00000000000..4685b1018cb
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-over.html]
+  [OffscreenCanvas test: 2d.composite.canvas.destination-over]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js.ini
new file mode 100644
index 00000000000..14f83384d7b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.destination-over.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.html.ini
new file mode 100644
index 00000000000..49363e838aa
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.lighter.html]
+  [OffscreenCanvas test: 2d.composite.canvas.lighter]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js.ini
new file mode 100644
index 00000000000..2a936dfbcb4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.lighter.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html.ini
new file mode 100644
index 00000000000..2824aad48da
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-atop.html]
+  [OffscreenCanvas test: 2d.composite.canvas.source-atop]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js.ini
new file mode 100644
index 00000000000..254bff2af4a
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-atop.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.html.ini
new file mode 100644
index 00000000000..7f8bd55a9d4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-in.html]
+  [OffscreenCanvas test: 2d.composite.canvas.source-in]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js.ini
new file mode 100644
index 00000000000..de52b6958ae
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-in.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.html.ini
new file mode 100644
index 00000000000..5eb0857ecbf
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-out.html]
+  [OffscreenCanvas test: 2d.composite.canvas.source-out]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js.ini
new file mode 100644
index 00000000000..37daba6eea9
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-out.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.html.ini
new file mode 100644
index 00000000000..81d7f73a45c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-over.html]
+  [OffscreenCanvas test: 2d.composite.canvas.source-over]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js.ini
new file mode 100644
index 00000000000..7f30fdb046f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.source-over.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.html.ini
new file mode 100644
index 00000000000..49599af2250
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.xor.html]
+  [OffscreenCanvas test: 2d.composite.canvas.xor]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js.ini
new file mode 100644
index 00000000000..84de9f256ce
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.canvas.xor.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini
new file mode 100644
index 00000000000..533dcd659e1
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.globalAlpha.image.html]
+  [OffscreenCanvas test: 2d.composite.globalAlpha.image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini
new file mode 100644
index 00000000000..a2408e6f9d1
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.globalAlpha.image.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini
new file mode 100644
index 00000000000..e2e341564b4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.globalAlpha.imagepattern.html]
+  [OffscreenCanvas test: 2d.composite.globalAlpha.imagepattern]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini
new file mode 100644
index 00000000000..234a3f006c9
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.globalAlpha.imagepattern.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini
new file mode 100644
index 00000000000..e9f06c605f2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.copy.html]
+  [OffscreenCanvas test: 2d.composite.image.copy]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini
new file mode 100644
index 00000000000..ec00c96fb2b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.copy.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini
new file mode 100644
index 00000000000..5022f8908d6
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-atop.html]
+  [OffscreenCanvas test: 2d.composite.image.destination-atop]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini
new file mode 100644
index 00000000000..2046175aac3
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-atop.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini
new file mode 100644
index 00000000000..f9e632b5462
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-in.html]
+  [OffscreenCanvas test: 2d.composite.image.destination-in]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini
new file mode 100644
index 00000000000..32908c3c484
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-in.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini
new file mode 100644
index 00000000000..d5dbd4bf438
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-out.html]
+  [OffscreenCanvas test: 2d.composite.image.destination-out]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini
new file mode 100644
index 00000000000..8060822fb5e
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-out.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini
new file mode 100644
index 00000000000..743325246ab
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-over.html]
+  [OffscreenCanvas test: 2d.composite.image.destination-over]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini
new file mode 100644
index 00000000000..a87842653ea
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.destination-over.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini
new file mode 100644
index 00000000000..48f3c6461ba
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.lighter.html]
+  [OffscreenCanvas test: 2d.composite.image.lighter]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini
new file mode 100644
index 00000000000..fb45ac0c1a9
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.lighter.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini
new file mode 100644
index 00000000000..5980e0f0a2a
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-atop.html]
+  [OffscreenCanvas test: 2d.composite.image.source-atop]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini
new file mode 100644
index 00000000000..c784780d9b4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-atop.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini
new file mode 100644
index 00000000000..3b216c32297
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-in.html]
+  [OffscreenCanvas test: 2d.composite.image.source-in]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini
new file mode 100644
index 00000000000..663578f318f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-in.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini
new file mode 100644
index 00000000000..89cc95f0485
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-out.html]
+  [OffscreenCanvas test: 2d.composite.image.source-out]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini
new file mode 100644
index 00000000000..0f6b42d6e01
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-out.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini
new file mode 100644
index 00000000000..5f4a050baf6
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-over.html]
+  [OffscreenCanvas test: 2d.composite.image.source-over]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini
new file mode 100644
index 00000000000..31c0edae3dc
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.source-over.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini
new file mode 100644
index 00000000000..d41764c974f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.xor.html]
+  [OffscreenCanvas test: 2d.composite.image.xor]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini
new file mode 100644
index 00000000000..d0f98d53471
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.image.xor.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini
new file mode 100644
index 00000000000..c73ed92eab0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.copy.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini
new file mode 100644
index 00000000000..d2f0f5260ea
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.copy.worker.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini
new file mode 100644
index 00000000000..82fb8a5ff86
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.destination-atop.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini
new file mode 100644
index 00000000000..7abafe82c31
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.destination-atop.worker.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini
new file mode 100644
index 00000000000..57e53fd0465
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.destination-in.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini
new file mode 100644
index 00000000000..0baa1cf152b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.destination-in.worker.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini
new file mode 100644
index 00000000000..01e4017ddc6
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.source-in.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini
new file mode 100644
index 00000000000..5453fbb0c6f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.source-in.worker.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini
new file mode 100644
index 00000000000..74aa8b83767
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.source-out.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini
new file mode 100644
index 00000000000..039cba1944f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.image.source-out.worker.html]
+  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini
new file mode 100644
index 00000000000..10cfce57e50
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.copy.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini
new file mode 100644
index 00000000000..4faf4ace88f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.copy.worker.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
new file mode 100644
index 00000000000..083fdd045f3
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.destination-atop.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini
new file mode 100644
index 00000000000..dc344e47931
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.destination-atop.worker.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
new file mode 100644
index 00000000000..ebd422dd61f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.destination-in.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini
new file mode 100644
index 00000000000..e821c9a2fe2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.destination-in.worker.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini
new file mode 100644
index 00000000000..d3efc0ef626
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.source-in.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini
new file mode 100644
index 00000000000..761a5faed6a
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.source-in.worker.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini
new file mode 100644
index 00000000000..6d77fdf24b4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.source-out.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini
new file mode 100644
index 00000000000..543eddf7f06
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.composite.uncovered.pattern.source-out.worker.html]
+  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html.ini
new file mode 100644
index 00000000000..6af33b23373
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.3arg.html]
+  [OffscreenCanvas test: 2d.drawImage.3arg]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js.ini
new file mode 100644
index 00000000000..dd30e563c00
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.3arg.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini
new file mode 100644
index 00000000000..6eb16015d70
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.5arg.html]
+  [OffscreenCanvas test: 2d.drawImage.5arg]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini
new file mode 100644
index 00000000000..45de12fade2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.5arg.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini
new file mode 100644
index 00000000000..f312f1589b8
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.basic.html]
+  [OffscreenCanvas test: 2d.drawImage.9arg.basic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini
new file mode 100644
index 00000000000..2ff0b98dcb5
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.basic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini
new file mode 100644
index 00000000000..a02165fabe7
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.destpos.html]
+  [OffscreenCanvas test: 2d.drawImage.9arg.destpos]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini
new file mode 100644
index 00000000000..3d4d5011b5f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.destpos.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini
new file mode 100644
index 00000000000..9d66e1bd341
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.destsize.html]
+  [OffscreenCanvas test: 2d.drawImage.9arg.destsize]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini
new file mode 100644
index 00000000000..a97dfe3464c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.destsize.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini
new file mode 100644
index 00000000000..3e8e707a8be
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.sourcepos.html]
+  [OffscreenCanvas test: 2d.drawImage.9arg.sourcepos]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini
new file mode 100644
index 00000000000..3ec5cbbadc9
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.sourcepos.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini
new file mode 100644
index 00000000000..44ad1e2efb0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.sourcesize.html]
+  [OffscreenCanvas test: 2d.drawImage.9arg.sourcesize]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini
new file mode 100644
index 00000000000..150dc88d58e
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.9arg.sourcesize.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini
new file mode 100644
index 00000000000..0b04a0d852d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.alpha.html]
+  [OffscreenCanvas test: 2d.drawImage.alpha]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini
new file mode 100644
index 00000000000..93ca873d5aa
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.alpha.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini
new file mode 100644
index 00000000000..dba65871688
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.animated.poster.html]
+  [drawImage() of an APNG draws the poster frame]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js.ini
new file mode 100644
index 00000000000..19ec8e5782b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.animated.poster.worker.html]
+  [drawImage() of an APNG draws the poster frame]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
new file mode 100644
index 00000000000..38c46fe7e71
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.broken.html]
+  [OffscreenCanvas test: 2d.drawImage.broken]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js.ini
new file mode 100644
index 00000000000..b85d2727a7a
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.broken.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini
new file mode 100644
index 00000000000..ddc364f4b22
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.clip.html]
+  [OffscreenCanvas test: 2d.drawImage.clip]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini
new file mode 100644
index 00000000000..f387c1acd65
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.clip.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini
new file mode 100644
index 00000000000..0d1eb846146
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.composite.html]
+  [OffscreenCanvas test: 2d.drawImage.composite]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini
new file mode 100644
index 00000000000..14975992b26
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.composite.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html.ini
new file mode 100644
index 00000000000..e3c09955f13
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.floatsource.html]
+  [OffscreenCanvas test: 2d.drawImage.floatsource]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js.ini
new file mode 100644
index 00000000000..5186c30c1a7
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.floatsource.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini
new file mode 100644
index 00000000000..d9c00e020cb
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.negativedest.html]
+  [Negative destination width/height represents the correct rectangle]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini
new file mode 100644
index 00000000000..31b9ec54018
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.negativedest.worker.html]
+  [Negative destination width/height represents the correct rectangle]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini
new file mode 100644
index 00000000000..cf30b485857
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.negativedir.html]
+  [Negative dimensions do not affect the direction of the image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini
new file mode 100644
index 00000000000..b789fbb639b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.negativedir.worker.html]
+  [Negative dimensions do not affect the direction of the image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini
new file mode 100644
index 00000000000..fe6fe1317b3
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.negativesource.html]
+  [Negative source width/height represents the correct rectangle]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini
new file mode 100644
index 00000000000..d20b4175b81
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.negativesource.worker.html]
+  [Negative source width/height represents the correct rectangle]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini
new file mode 100644
index 00000000000..968631ac458
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.nonfinite.html]
+  [drawImage() with Infinity/NaN is ignored]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini
new file mode 100644
index 00000000000..d88e35b08a4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.nonfinite.worker.html]
+  [drawImage() with Infinity/NaN is ignored]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini
new file mode 100644
index 00000000000..aac6b35b06d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.nowrap.html]
+  [Stretched images do not get pixels wrapping around the edges]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini
new file mode 100644
index 00000000000..61d2ac9b727
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.nowrap.worker.html]
+  [Stretched images do not get pixels wrapping around the edges]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini
new file mode 100644
index 00000000000..0a613ba46a2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.path.html]
+  [OffscreenCanvas test: 2d.drawImage.path]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini
new file mode 100644
index 00000000000..e3dc6d5ad67
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.path.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html.ini
new file mode 100644
index 00000000000..adaff1bb3fe
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.svg.html]
+  [drawImage() of an SVG image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js.ini
new file mode 100644
index 00000000000..a97b8b37d07
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.svg.worker.html]
+  [drawImage() of an SVG image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini
new file mode 100644
index 00000000000..43c1fd403c1
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.transform.html]
+  [OffscreenCanvas test: 2d.drawImage.transform]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini
new file mode 100644
index 00000000000..864d3b3ba40
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.transform.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini
new file mode 100644
index 00000000000..ead7f5f5ad8
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.zerosource.html]
+  [drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
new file mode 100644
index 00000000000..c1ee61dcd49
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.zerosource.image.html]
+  [drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini
new file mode 100644
index 00000000000..341b1b43e6f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.zerosource.image.worker.html]
+  [drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini
new file mode 100644
index 00000000000..9160e3ad144
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.zerosource.worker.html]
+  [drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini
new file mode 100644
index 00000000000..62a146b9e10
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.basic.image.html]
+  [OffscreenCanvas test: 2d.pattern.basic.image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini
new file mode 100644
index 00000000000..07fb18f36da
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.basic.image.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html.ini
new file mode 100644
index 00000000000..10801c45182
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.crosscanvas.html]
+  [OffscreenCanvas test: 2d.pattern.crosscanvas]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js.ini
new file mode 100644
index 00000000000..8cee3673690
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.crosscanvas.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini
new file mode 100644
index 00000000000..43247565daa
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.basic.html]
+  [OffscreenCanvas test: 2d.pattern.paint.norepeat.basic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini
new file mode 100644
index 00000000000..18a0858cc72
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.basic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini
new file mode 100644
index 00000000000..aabfaba54a4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.coord1.html]
+  [OffscreenCanvas test: 2d.pattern.paint.norepeat.coord1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini
new file mode 100644
index 00000000000..482d993483c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.coord1.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html.ini
new file mode 100644
index 00000000000..a5301a46eb8
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.coord2.html]
+  [OffscreenCanvas test: 2d.pattern.paint.norepeat.coord2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js.ini
new file mode 100644
index 00000000000..e2307def738
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.coord2.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini
new file mode 100644
index 00000000000..a3c5fc7486a
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.coord3.html]
+  [OffscreenCanvas test: 2d.pattern.paint.norepeat.coord3]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini
new file mode 100644
index 00000000000..7c26ae9c4bb
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.coord3.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini
new file mode 100644
index 00000000000..8311cbfbc03
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.outside.html]
+  [OffscreenCanvas test: 2d.pattern.paint.norepeat.outside]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini
new file mode 100644
index 00000000000..1ae5e67ad59
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.norepeat.outside.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini
new file mode 100644
index 00000000000..947172da5d2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.orientation.image.html]
+  [Image patterns do not get flipped when painted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini
new file mode 100644
index 00000000000..3ae068f7c81
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.orientation.image.worker.html]
+  [Image patterns do not get flipped when painted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini
new file mode 100644
index 00000000000..f5af5115e4c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.basic.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeat.basic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini
new file mode 100644
index 00000000000..2258a149ec2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.basic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini
new file mode 100644
index 00000000000..584ece267cc
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.coord1.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeat.coord1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini
new file mode 100644
index 00000000000..dfe2f7b03ee
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.coord1.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html.ini
new file mode 100644
index 00000000000..601c4e305d4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.coord2.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeat.coord2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js.ini
new file mode 100644
index 00000000000..9482ceb3fd5
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.coord2.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html.ini
new file mode 100644
index 00000000000..6c351f90196
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.coord3.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeat.coord3]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js.ini
new file mode 100644
index 00000000000..208dc89c31d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.coord3.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini
new file mode 100644
index 00000000000..ccdaaa1df88
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.outside.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeat.outside]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini
new file mode 100644
index 00000000000..62f773680be
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeat.outside.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini
new file mode 100644
index 00000000000..354a21b922c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeatx.basic.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeatx.basic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini
new file mode 100644
index 00000000000..a70d19497c6
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeatx.basic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini
new file mode 100644
index 00000000000..288a61063e5
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeatx.coord1.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeatx.coord1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini
new file mode 100644
index 00000000000..d5e57212449
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeatx.coord1.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini
new file mode 100644
index 00000000000..a27a8dcbbc0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeatx.outside.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeatx.outside]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini
new file mode 100644
index 00000000000..ee3cdd3b8d0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeatx.outside.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini
new file mode 100644
index 00000000000..028fe614e48
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeaty.basic.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeaty.basic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini
new file mode 100644
index 00000000000..880bd580da5
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeaty.basic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini
new file mode 100644
index 00000000000..f2110e702ba
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeaty.coord1.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeaty.coord1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini
new file mode 100644
index 00000000000..790df4ff997
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeaty.coord1.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini
new file mode 100644
index 00000000000..035bd9b0101
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeaty.outside.html]
+  [OffscreenCanvas test: 2d.pattern.paint.repeaty.outside]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini
new file mode 100644
index 00000000000..60bbba05f78
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.paint.repeaty.outside.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini
new file mode 100644
index 00000000000..89b79ac53fa
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.repeat.empty.html]
+  [OffscreenCanvas test: 2d.pattern.repeat.empty]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini
new file mode 100644
index 00000000000..46202a09c10
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.pattern.repeat.empty.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini
new file mode 100644
index 00000000000..957d04b99f6
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.alpha.html]
+  [Shadows are drawn correctly for partially-transparent images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini
new file mode 100644
index 00000000000..07edc88f46d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.alpha.worker.html]
+  [Shadows are drawn correctly for partially-transparent images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini
new file mode 100644
index 00000000000..81fa284a386
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.basic.html]
+  [Shadows are drawn for images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini
new file mode 100644
index 00000000000..40c817c2cac
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.basic.worker.html]
+  [Shadows are drawn for images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini
new file mode 100644
index 00000000000..8cba6d0463e
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.scale.html]
+  [Shadows are drawn correctly for scaled images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini
new file mode 100644
index 00000000000..79a1915a65f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.scale.worker.html]
+  [Shadows are drawn correctly for scaled images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini
new file mode 100644
index 00000000000..cd025c01c7a
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.section.html]
+  [Shadows are not drawn for areas outside image source rectangles]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini
new file mode 100644
index 00000000000..6944b590506
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.section.worker.html]
+  [Shadows are not drawn for areas outside image source rectangles]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini
new file mode 100644
index 00000000000..d7b14dd0ccd
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.transparent.1.html]
+  [Shadows are not drawn for transparent images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini
new file mode 100644
index 00000000000..ecd1b8c8ad9
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.transparent.1.worker.html]
+  [Shadows are not drawn for transparent images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini
new file mode 100644
index 00000000000..fdc1a6c0a13
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.transparent.2.html]
+  [Shadows are not drawn for transparent parts of images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini
new file mode 100644
index 00000000000..217876dd3ab
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.image.transparent.2.worker.html]
+  [Shadows are not drawn for transparent parts of images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html.ini
new file mode 100644
index 00000000000..fea2a9797f0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.alpha.html]
+  [Shadows are drawn correctly for partially-transparent fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js.ini
new file mode 100644
index 00000000000..0410fc13749
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.alpha.worker.html]
+  [Shadows are drawn correctly for partially-transparent fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.html.ini
new file mode 100644
index 00000000000..7c68f2396b2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.basic.html]
+  [Shadows are drawn for fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js.ini
new file mode 100644
index 00000000000..3706419d12c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.basic.worker.html]
+  [Shadows are drawn for fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html.ini
new file mode 100644
index 00000000000..b9b5f6ddf02
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.transparent.1.html]
+  [Shadows are not drawn for transparent fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js.ini
new file mode 100644
index 00000000000..c01e4e8ba05
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.transparent.1.worker.html]
+  [Shadows are not drawn for transparent fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html.ini
new file mode 100644
index 00000000000..ee122e4fe1d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.transparent.2.html]
+  [Shadows are not drawn for transparent parts of fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js.ini
new file mode 100644
index 00000000000..d4e81fe0dd9
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.shadow.pattern.transparent.2.worker.html]
+  [Shadows are not drawn for transparent parts of fill patterns]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.html.ini
new file mode 100644
index 00000000000..a94c7f3a91c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.center.html]
+  [textAlign center is the center of the em squares (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.worker.js.ini
new file mode 100644
index 00000000000..6026785e070
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.center.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.center.worker.html]
+  [textAlign center is the center of the em squares (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.html.ini
new file mode 100644
index 00000000000..e87fa1ae542
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.end.ltr.html]
+  [textAlign end with ltr is the right edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js.ini
new file mode 100644
index 00000000000..52631c3760e
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.end.ltr.worker.html]
+  [textAlign end with ltr is the right edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.html.ini
new file mode 100644
index 00000000000..4546e4efe3d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.end.rtl.html]
+  [textAlign end with rtl is the left edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js.ini
new file mode 100644
index 00000000000..a7b0a633112
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.end.rtl.worker.html]
+  [textAlign end with rtl is the left edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.html.ini
new file mode 100644
index 00000000000..44e7bfc3349
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.left.html]
+  [textAlign left is the left of the first em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.worker.js.ini
new file mode 100644
index 00000000000..3dd79127c2d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.left.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.left.worker.html]
+  [textAlign left is the left of the first em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.html.ini
new file mode 100644
index 00000000000..ab6ee4d84cf
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.right.html]
+  [textAlign right is the right of the last em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.worker.js.ini
new file mode 100644
index 00000000000..5ad453db21b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.right.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.right.worker.html]
+  [textAlign right is the right of the last em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.html.ini
new file mode 100644
index 00000000000..9403b25f6f1
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.start.ltr.html]
+  [textAlign start with ltr is the left edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js.ini
new file mode 100644
index 00000000000..bfefcfc44e0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.start.ltr.worker.html]
+  [textAlign start with ltr is the left edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.html.ini
new file mode 100644
index 00000000000..297adfc6827
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.start.rtl.html]
+  [textAlign start with rtl is the right edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js.ini
new file mode 100644
index 00000000000..bf27dcf3e32
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.align.start.rtl.worker.html]
+  [textAlign start with rtl is the right edge]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html.ini
new file mode 100644
index 00000000000..4748acffa82
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.alphabetic.html]
+  [OffscreenCanvas test: 2d.text.draw.baseline.alphabetic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js.ini
new file mode 100644
index 00000000000..6b37d3e0e0d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.alphabetic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.html.ini
new file mode 100644
index 00000000000..a7c97c18e6e
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.bottom.html]
+  [textBaseline bottom is the bottom of the em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js.ini
new file mode 100644
index 00000000000..9e5116ded9f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.bottom.worker.html]
+  [textBaseline bottom is the bottom of the em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.html.ini
new file mode 100644
index 00000000000..eb853cdbacd
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.hanging.html]
+  [OffscreenCanvas test: 2d.text.draw.baseline.hanging]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js.ini
new file mode 100644
index 00000000000..9faf66f5c5c
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.hanging.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html.ini
new file mode 100644
index 00000000000..eb8dc40e7a2
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.ideographic.html]
+  [OffscreenCanvas test: 2d.text.draw.baseline.ideographic]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js.ini
new file mode 100644
index 00000000000..f015913a15b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.ideographic.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.html.ini
new file mode 100644
index 00000000000..4969502107f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.middle.html]
+  [textBaseline middle is the middle of the em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js.ini
new file mode 100644
index 00000000000..974b2268d42
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.middle.worker.html]
+  [textBaseline middle is the middle of the em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.html.ini
new file mode 100644
index 00000000000..fde10ed8b71
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.top.html]
+  [textBaseline top is the top of the em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js.ini
new file mode 100644
index 00000000000..c2767f7d4fd
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.baseline.top.worker.html]
+  [textBaseline top is the top of the em square (not the bounding box)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html.ini
new file mode 100644
index 00000000000..1a92a639587
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fill.maxWidth.bound.html]
+  [fillText handles maxWidth based on line size, not bounding box size]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini
new file mode 100644
index 00000000000..d9887186aa8
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fill.maxWidth.bound.worker.html]
+  [fillText handles maxWidth based on line size, not bounding box size]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html.ini
new file mode 100644
index 00000000000..3e7da9f9a61
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fill.maxWidth.fontface.html]
+  [fillText works on @font-face fonts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini
new file mode 100644
index 00000000000..b857906dd86
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fill.maxWidth.fontface.worker.html]
+  [fillText works on @font-face fonts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.html.ini
new file mode 100644
index 00000000000..9b27eb4714b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fontface.html]
+  [OffscreenCanvas test: 2d.text.draw.fontface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html.ini
new file mode 100644
index 00000000000..21a787eebd0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fontface.notinpage.html]
+  [@font-face fonts should work even if they are not used in the page]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js.ini
new file mode 100644
index 00000000000..7edd64d74ac
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fontface.notinpage.worker.html]
+  [@font-face fonts should work even if they are not used in the page]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini
new file mode 100644
index 00000000000..b28e435ff8b
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fontface.repeat.html]
+  [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini
new file mode 100644
index 00000000000..7dec0caa9d7
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fontface.repeat.worker.html]
+  [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.worker.js.ini
new file mode 100644
index 00000000000..dfee74c01a1
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.fontface.worker.html]
+  [2d]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.html.ini
new file mode 100644
index 00000000000..b24ad7daaf5
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.basic.html]
+  [U+0020 is rendered the correct size (1em wide)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.worker.js.ini
new file mode 100644
index 00000000000..685610a0956
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.basic.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.basic.worker.html]
+  [U+0020 is rendered the correct size (1em wide)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.html.ini
new file mode 100644
index 00000000000..cb95d477d9f
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.end.html]
+  [Space characters at the end of a line are collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js.ini
new file mode 100644
index 00000000000..a6d773d8450
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.end.worker.html]
+  [Space characters at the end of a line are collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html.ini
new file mode 100644
index 00000000000..403c4063ea3
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.nonspace.html]
+  [Non-space characters are not converted to U+0020 and collapsed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js.ini
new file mode 100644
index 00000000000..6730cfd7811
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.nonspace.worker.html]
+  [Non-space characters are not converted to U+0020 and collapsed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.html.ini
new file mode 100644
index 00000000000..1eb038b12c4
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.other.html]
+  [Space characters are converted to U+0020, and collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js.ini
new file mode 100644
index 00000000000..8959b461ee0
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.other.worker.html]
+  [Space characters are converted to U+0020, and collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.html.ini
new file mode 100644
index 00000000000..6aebf256e44
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.space.html]
+  [Space characters are converted to U+0020, and collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js.ini
new file mode 100644
index 00000000000..7a55af6845d
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.space.worker.html]
+  [Space characters are converted to U+0020, and collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.html.ini
new file mode 100644
index 00000000000..2e400f45551
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.html.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.start.html]
+  [Space characters at the start of a line are collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js.ini
new file mode 100644
index 00000000000..32469f60d90
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.text.draw.space.collapse.start.worker.html]
+  [Space characters at the start of a line are collapsed (per CSS)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/size.large.html.ini b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/size.large.html.ini
new file mode 100644
index 00000000000..68cde348264
--- /dev/null
+++ b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/size.large.html.ini
@@ -0,0 +1,2 @@
+[size.large.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini b/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini
index 2dfa1145679..5d8e04f7e44 100644
--- a/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrFrame_getPose.https.html.ini
@@ -1,8 +1,4 @@
 [xrFrame_getPose.https.html]
-  expected: ERROR
-  [XRFrame.getPose works for immersive sessions]
-    expected: TIMEOUT
-
   [XRFrame.getPose works for non-immersive sessions]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
index 30384e0b3e4..a9aebdbfe89 100644
--- a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
+++ b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
@@ -20,3 +20,17 @@ promise_test(async test => {
           'test_tag'),
       'register() must reject on pending and installing workers');
 }, 'Periodic Background Sync requires an activated Service Worker');
+
+promise_test(async test => {
+  const script = 'service_workers/sw.js';
+  const scope = 'service_workers' + location.pathname;
+
+  const serviceWorkerRegistration =
+      await service_worker_unregister_and_register(test, script, scope);
+
+  assert_equals(
+      serviceWorkerRegistration.active, null,
+      'There must not be an activated worker');
+
+  await serviceWorkerRegistration.periodicSync.unregister('test_tag');
+  }, 'Periodic Background Sync unregister silently succeeds when Service Worker is unactivated');
diff --git a/tests/wpt/web-platform-tests/README.md b/tests/wpt/web-platform-tests/README.md
index 8f755f2ac2f..3b580da8690 100644
--- a/tests/wpt/web-platform-tests/README.md
+++ b/tests/wpt/web-platform-tests/README.md
@@ -1,6 +1,8 @@
 The web-platform-tests Project
 ==============================
 
+[![Taskcluster CI Status](https://community-tc.services.mozilla.com/api/github/v1/repository/web-platform-tests/wpt/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/web-platform-tests/wpt/master/latest)
+
 The web-platform-tests Project is a W3C-coordinated attempt to build a
 cross-browser test suite for the Web-platform stack. Writing tests in a way
 that allows them to be run in all browsers gives browser projects
diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html b/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html
index ebaf6941a89..9effbc69d61 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html
@@ -16,13 +16,14 @@ Content-Security-Policy-Report-Only: script-src 'unsafe-inline' 'nonce-abc'; rep
       document.addEventListener('securitypolicyviolation', t_spv.step_func(e => {
         assert_equals(e.violatedDirective, "script-src");
         assert_equals(e.blockedURI, "eval");
+        t_spv.done();
       }));
 
       try {
         eval("t.done()");
       } catch {
         t.step(t.unreached_func("The eval should have executed succesfully"));
-        t_spv.step(tsv_unreached_func("The eval execution should have triggered a securitypolicyviolation event"));
+        t_spv.step(t_spv.unreached_func("The eval execution should have triggered a securitypolicyviolation event"));
       }
     </script>
     <script nonce='abc' async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27unsafe-inline%27'></script>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixed-size-child-with-overflow.html b/tests/wpt/web-platform-tests/css/css-multicol/fixed-size-child-with-overflow.html
new file mode 100644
index 00000000000..60300c3cd65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/fixed-size-child-with-overflow.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-gaps-and-rules">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:4; column-fill:auto; column-gap:5px; column-rule:5px solid green; width:100px; height:100px; background:red;">
+  <div style="height:50px;">
+    <div style="height:400px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line-ref.html b/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line-ref.html
new file mode 100644
index 00000000000..16be12ca918
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<p>The word "PASS" should be seen below, and there should be no red.</p>
+<div style="line-height:200px;">
+  PASS
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line.html b/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line.html
new file mode 100644
index 00000000000..67a289ca558
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model">
+<link rel="help" href="https://drafts.csswg.org/css-break/#unforced-breaks">
+<link rel="match" href="nested-with-too-tall-line-ref.html">
+<style>
+    .multicol { columns:2; column-fill:auto; }
+</style>
+<p>The word "PASS" should be seen below, and there should be no red.</p>
+<div class="multicol" style="width:100px; height:100px; line-height:200px;">
+    <div class="multicol" style="height:200px; column-rule:solid red;">
+        PASS
+    </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
new file mode 100644
index 00000000000..05da6f89a9e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: Default styles for ::marker</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<meta name="assert" content="This test checks that ::marker gets assigned some styles in UA origin." />
+<style>
+.outside { list-style-position: outside }
+.inside { list-style-position: inside }
+.symbol { list-style-type: symbol }
+.decimal { list-style-type: decimal }
+.string { list-style-type: "string" }
+.marker::marker { content: "marker" }
+</style>
+<div id="log"></div>
+<ul>
+  <li class="outside symbol">outside symbol</li>
+  <li class="outside decimal">outside decimal</li>
+  <li class="outside string">outside string</li>
+  <li class="outside marker">outside marker</li>
+  <li class="inside symbol">inside symbol</li>
+  <li class="inside decimal">inside decimal</li>
+  <li class="inside string">inside string</li>
+  <li class="inside marker">inside marker</li>
+</ul>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<script>
+const defaultStyles = [
+  ["unicode-bidi", "isolate"],
+  ["font-variant-numeric", "tabular-nums"],
+];
+for (const target of document.querySelectorAll("li")) {
+  const cs = getComputedStyle(target, "::marker");
+  for (const [prop, value] of defaultStyles) {
+    test(function() {
+      assert_equals(cs.getPropertyValue(prop), value);
+    }, `Computed value of '${prop}' for ${target.className}`);
+  }
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html
new file mode 100644
index 00000000000..4a3dd196587
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+@font-face {
+  /* This font looks different with 'font-variant-numeric: tabular-nums' */
+  font-family: 'Exo 2';
+  src: local('Exo 2'),
+       url('/css/css-fonts/support/fonts/Exo2-SemiBold.otf') format("opentype");
+}
+ol {
+  float: left;
+  width: 50px;
+  line-height: 25px;
+  list-style-position: inside;
+  font-family: "Exo 2";
+}
+span {
+  display: inline-block;
+  vertical-align: top;
+}
+li:first-child::before {
+  content: '\200B'; /* zero-width space */
+}
+li:first-child::after {
+  content: '';
+  position: absolute;
+  height: 225px;
+  width: 25px;
+  background: black;
+}
+</style>
+<ol>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+</ol>
+<ol>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+</ol>
+<ol>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+</ol>
+<ol>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+</ol>
+<ol>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default.html
new file mode 100644
index 00000000000..037ec8a0c3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker has 'font-variant-numeric: tabular-nums' by default</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="match" href="marker-font-variant-numeric-default-ref.html">
+<link rel="mismatch" href="marker-font-variant-numeric-normal-ref.html">
+<meta name="assert" content="Checks that the markers have the same width thanks to 'font-variant-numeric: tabular-nums', and thus the black boxes are perfectly aligned">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+@font-face {
+  /* This font looks different with 'font-variant-numeric: tabular-nums' */
+  font-family: 'Exo 2';
+  src: local('Exo 2'),
+       url('/css/css-fonts/support/fonts/Exo2-SemiBold.otf') format("opentype");
+}
+ol {
+  float: left;
+  width: 50px;
+  line-height: 25px;
+  list-style-position: inside;
+  font-family: "Exo 2";
+}
+span {
+  display: inline-block;
+  font: 25px/1 Ahem;
+  vertical-align: top;
+}
+
+li:nth-child(1) { --marker: "1. " }
+li:nth-child(2) { --marker: "2. " }
+li:nth-child(3) { --marker: "3. " }
+li:nth-child(4) { --marker: "4. " }
+li:nth-child(5) { --marker: "5. " }
+li:nth-child(6) { --marker: "6. " }
+li:nth-child(7) { --marker: "7. " }
+li:nth-child(8) { --marker: "8. " }
+li:nth-child(9) { --marker: "9. " }
+
+.string > li {
+  list-style-type: var(--marker);
+}
+.marker > li::marker {
+  content: var(--marker);
+}
+.before > li, .after > li {
+  display: block;
+}
+.before > li::before, .after > li::after {
+  content: "\200B"; /* zero-width space */
+  display: list-item;
+  float: left;
+}
+</style>
+<ol class="decimal">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="string">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="marker">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="before">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="after">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html
new file mode 100644
index 00000000000..db5923cda20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+@font-face {
+  /* This font looks different with 'font-variant-numeric: tabular-nums' */
+  font-family: 'Exo 2';
+  src: local('Exo 2'),
+       url('/css/css-fonts/support/fonts/Exo2-SemiBold.otf') format("opentype");
+}
+ol {
+  float: left;
+  width: 50px;
+  line-height: 25px;
+  list-style-type: none;
+  font-family: "Exo 2";
+}
+span {
+  display: inline-block;
+  vertical-align: top;
+  width: 25px;
+  height: 25px;
+  background: black;
+}
+</style>
+<ol>
+  <li>1. <span>X</span></li>
+  <li>2. <span>X</span></li>
+  <li>3. <span>X</span></li>
+  <li>4. <span>X</span></li>
+  <li>5. <span>X</span></li>
+  <li>6. <span>X</span></li>
+  <li>7. <span>X</span></li>
+  <li>8. <span>X</span></li>
+  <li>9. <span>X</span></li>
+</ol>
+<ol>
+  <li>1. <span>X</span></li>
+  <li>2. <span>X</span></li>
+  <li>3. <span>X</span></li>
+  <li>4. <span>X</span></li>
+  <li>5. <span>X</span></li>
+  <li>6. <span>X</span></li>
+  <li>7. <span>X</span></li>
+  <li>8. <span>X</span></li>
+  <li>9. <span>X</span></li>
+</ol>
+<ol>
+  <li>1. <span>X</span></li>
+  <li>2. <span>X</span></li>
+  <li>3. <span>X</span></li>
+  <li>4. <span>X</span></li>
+  <li>5. <span>X</span></li>
+  <li>6. <span>X</span></li>
+  <li>7. <span>X</span></li>
+  <li>8. <span>X</span></li>
+  <li>9. <span>X</span></li>
+</ol>
+<ol>
+  <li>1. <span>X</span></li>
+  <li>2. <span>X</span></li>
+  <li>3. <span>X</span></li>
+  <li>4. <span>X</span></li>
+  <li>5. <span>X</span></li>
+  <li>6. <span>X</span></li>
+  <li>7. <span>X</span></li>
+  <li>8. <span>X</span></li>
+  <li>9. <span>X</span></li>
+</ol>
+<ol>
+  <li>1. <span>X</span></li>
+  <li>2. <span>X</span></li>
+  <li>3. <span>X</span></li>
+  <li>4. <span>X</span></li>
+  <li>5. <span>X</span></li>
+  <li>6. <span>X</span></li>
+  <li>7. <span>X</span></li>
+  <li>8. <span>X</span></li>
+  <li>9. <span>X</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html
new file mode 100644
index 00000000000..d135afe41eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker accepts 'font-variant-numeric: normal'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="match" href="marker-font-variant-numeric-normal-ref.html">
+<link rel="mismatch" href="marker-font-variant-numeric-default-ref.html">
+<meta name="assert" content="Checks that the marker default 'font-variant-numeric: tabular-nums' can be overridden with 'font-variant-numeric: normal'">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+@font-face {
+  /* This font looks different with 'font-variant-numeric: tabular-nums' */
+  font-family: 'Exo 2';
+  src: local('Exo 2'),
+       url('/css/css-fonts/support/fonts/Exo2-SemiBold.otf') format("opentype");
+}
+ol {
+  float: left;
+  width: 50px;
+  line-height: 25px;
+  list-style-position: inside;
+  font-family: "Exo 2";
+}
+span {
+  display: inline-block;
+  font: 25px/1 Ahem;
+  vertical-align: top;
+}
+
+li:nth-child(1) { --marker: "1. " }
+li:nth-child(2) { --marker: "2. " }
+li:nth-child(3) { --marker: "3. " }
+li:nth-child(4) { --marker: "4. " }
+li:nth-child(5) { --marker: "5. " }
+li:nth-child(6) { --marker: "6. " }
+li:nth-child(7) { --marker: "7. " }
+li:nth-child(8) { --marker: "8. " }
+li:nth-child(9) { --marker: "9. " }
+
+.string > li {
+  list-style-type: var(--marker);
+}
+.marker > li::marker {
+  content: var(--marker);
+}
+.before > li, .after > li {
+  display: block;
+}
+.before > li::before, .after > li::after {
+  content: "\200B"; /* zero-width space */
+  display: list-item;
+  float: left;
+}
+
+::marker {
+  font-variant-numeric: normal;
+}
+::before::marker, ::after::marker {
+  font-variant-numeric: normal;
+}
+</style>
+<ol class="decimal">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="string">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="marker">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="before">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
+<ol class="after">
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+  <li><span>X</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default-ref.html
new file mode 100644
index 00000000000..71e81474ce1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+ol {
+  float: left;
+  list-style-type: none;
+}
+.rtl {
+  direction: rtl;
+}
+.marker {
+  unicode-bidi: isolate;
+  color: blue;
+}
+.text {
+  background: yellow;
+}
+</style>
+<ol class="ltr">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
+<ol class="rtl">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
+<ol class="ltr">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
+<ol class="rtl">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html
new file mode 100644
index 00000000000..00d4d28e7d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker has 'unicode-bidi: isolate' by default</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="match" href="marker-unicode-bidi-default-ref.html">
+<link rel="mismatch" href="marker-unicode-bidi-normal-ref.html">
+<meta name="assert" content="Checks that the markers are isolated from the list items by the bidi algorithm">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+ol {
+  float: left;
+  list-style-position: inside;
+}
+.rtl {
+  direction: rtl;
+}
+
+li:nth-child(1) { --marker: "\627 \644 " }
+li:nth-child(2) { --marker: "\61 \627 \644 " }
+li:nth-child(3) { --marker: "\627 \644 \62 " }
+li:nth-child(4) { --marker: "\61 \627 \644 \62 " }
+li:nth-child(5) { --marker: "\61 \62 \627 \644 " }
+li:nth-child(6) { --marker: "\627 \644 \61 \62 " }
+li:nth-child(7) { --marker: "\31 \627 \644 " }
+li:nth-child(8) { --marker: "\627 \644 \32 " }
+li:nth-child(9) { --marker: "\31 \627 \644 \32 " }
+
+.string > li {
+  list-style-type: var(--marker);
+}
+.marker > li::marker {
+  content: var(--marker);
+}
+::marker {
+  color: blue;
+}
+span {
+  background: yellow;
+}
+</style>
+<ol class="string ltr">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
+<ol class="string rtl">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
+<ol class="marker ltr">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
+<ol class="marker rtl">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html
new file mode 100644
index 00000000000..825c601ed4c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+ol {
+  float: left;
+  list-style-type: none;
+}
+.rtl {
+  direction: rtl;
+}
+.marker {
+  unicode-bidi: normal;
+  color: blue;
+}
+.text {
+  background: yellow;
+}
+</style>
+<ol class="ltr">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
+<ol class="rtl">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
+<ol class="ltr">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
+<ol class="rtl">
+  <li><span class="marker">&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x627;&#x644;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x61;&#x62;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x61;&#x62;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+  <li><span class="marker">&#x31;&#x627;&#x644;&#x32;</span><span class="text">0</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html
new file mode 100644
index 00000000000..ec01afa4a19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker accepts 'unicode-bidi: normal'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="match" href="marker-unicode-bidi-normal-ref.html">
+<link rel="mismatch" href="marker-unicode-bidi-default-ref.html">
+<meta name="assert" content="Checks that the marker default 'unicode-bidi: isolate' can be overridden with 'unicode-bidi: normal'">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+ol {
+  float: left;
+  list-style-position: inside;
+}
+.rtl {
+  direction: rtl;
+}
+
+li:nth-child(1) { --marker: "\627 \644 " }
+li:nth-child(2) { --marker: "\61 \627 \644 " }
+li:nth-child(3) { --marker: "\627 \644 \62 " }
+li:nth-child(4) { --marker: "\61 \627 \644 \62 " }
+li:nth-child(5) { --marker: "\61 \62 \627 \644 " }
+li:nth-child(6) { --marker: "\627 \644 \61 \62 " }
+li:nth-child(7) { --marker: "\31 \627 \644 " }
+li:nth-child(8) { --marker: "\627 \644 \32 " }
+li:nth-child(9) { --marker: "\31 \627 \644 \32 " }
+
+.string > li {
+  list-style-type: var(--marker);
+}
+.marker > li::marker {
+  content: var(--marker);
+}
+::marker {
+  unicode-bidi: normal;
+  color: blue;
+}
+span {
+  background: yellow;
+}
+</style>
+<ol class="string ltr">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
+<ol class="string rtl">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
+<ol class="marker ltr">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
+<ol class="marker rtl">
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+  <li><span>0</span></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html
index 80fcc4cca0c..4bc222f4e72 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html
@@ -33,6 +33,7 @@ onscroll = t.step_func(function() {
   }));
 });
 window.onload = t.step_func(function() {
-  window.scrollTo(0, document.scrollingElement.scrollTopMax - 200);
+  window.scrollTo(0, document.documentElement.scrollHeight);
+  window.scrollBy(0, -200);
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html
index 855ec1e87a9..4e78815599e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html
index 8ef0497f50f..61e612461d1 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html
index b7ac094cc29..cb49f01a982 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html
index d68fac13de6..97fc5736288 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html
index 859e033ae76..4629db93b6c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html
index 9c5e4e6f97e..001269158d3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html
index 65496f1019d..0a899e240c1 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html
index 606a463874f..a49ce9cdcf9 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html
index 1e3e331ca54..7ce25709481 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html
index 90dbfd73bbc..b5dde82a113 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html
@@ -13,7 +13,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html
index 075aca4a57d..9eb1d181243 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html
index 984e703a5c4..a07c35b10e8 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html
index 3754845856b..d115bf09b88 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html
index 2c43f5f45f8..157c19cf1f7 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html
index 653386289dd..21e19d1715e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html
index e848e64622d..96240cae72f 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html
index 9f990b7479a..1c5fa0a981a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html
index 2f32a815a09..8418d39731e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html
index 6df7d7d8f5e..9793a95dd3a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html
index c43a7664109..dae2e050ec0 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html
index 2b686f4896c..9ce44d1e554 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html
index 2a43c803b91..61c4d240cd5 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html
index d2f5640195b..6f98a12cbd3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html
index 7a98633c386..1ea4aa60c13 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html
index b03e2015c1d..e3a68081760 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html
index feace76b8e3..4554c2834e3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html
index 25aca08eaa8..e5dad75eb07 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html
index ba83c03b38d..e7a56f7c90d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html
index c22131c0bed..cd42f018b01 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html
index 332845b1138..4c33e53cf99 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html
index e5f2e6549de..ac68840c78a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html
index da8ada0d28a..c2b583b6891 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html
index b53b0d1b9a9..eeebd0a6813 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html
@@ -13,7 +13,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html
index 84b72feea54..69272200dda 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html
@@ -13,7 +13,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html
index 47d2e6d9bb0..1dbad5ed818 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html
index 64d7929c5f4..17fd94a6fe5 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html
index 94c44df696b..7a025ca223d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html
index 70f45dca8c5..4108fc090c9 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html
index 77380841ff0..f5a403f6702 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html
index d7fdd0a8a2a..a4bb76e8451 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html
index ce4e9e4be9e..d5afb862a41 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html
index 08b3fd3d8c6..b1f5f17bf5f 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html
index e4d900aeb77..93d1103ce0c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html
index d7658c9027a..565f2682f6a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html
index 45460bc49dc..b935ce02cc7 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html
index f5eb0ade748..047dfe40537 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html
index d2db6300340..86fb97134ac 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html
@@ -5,7 +5,7 @@
 <title>CSS3 Text, text transform: German sharp S, uppercase</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
 <style type='text/css'>
-.test, .ref { font-size: 200%; line-height: 2.5em; }
+.test, .ref { font-size: 125%; line-height: 1.5em; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
@@ -13,4 +13,4 @@
 <p class="instructions">Test passes if both characters below match.</p>
 <div class="test" lang="de"><span>SS SS</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html
index b0364476e63..e09c1a0f5c7 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html
@@ -13,7 +13,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
@@ -21,4 +21,4 @@
 <p class="instructions">Test passes if the both characters in each pair match. If you are missing a font glyph for a character, ignore that pair, but report which characters were ignored.</p>
 <div class="test"><span>FF FF</span> <span>FI FI</span> <span>FL FL</span> <span>FFI FFI</span> <span>FFL FFL</span> <span>ST ST</span> <span>ST ST</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html
index 680c663734c..b3157486c3c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
@@ -19,4 +19,4 @@
 <p class="instructions">Test passes if the both characters in each pair match. If you are missing a font glyph for a character, ignore that pair, but report which characters were ignored.</p>
 <div class="test"><span>&#x0535;&#x0552; &#x0535;&#x0552;</span> <span>&#x0544;&#x0546; &#x0544;&#x0546;</span> <span>&#x0544;&#x0535; &#x0544;&#x0535;</span> <span>&#x0544;&#x053B; &#x0544;&#x053B;</span> <span>&#x054E;&#x0546; &#x054E;&#x0546;</span> <span>&#x0544;&#x053D; &#x0544;&#x053D;</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html
index bcfe1504ad9..e050170986e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
@@ -19,4 +19,4 @@
 <p class="instructions">Test passes if both characters in each pair match. If you are missing a font glyph for a character, ignore that pair, but report which characters were ignored.</p>
 <div class="test"><span>&#x02BC;N &#x02BC;N</span> <span>&#x03AA;&#x0301; &#x03AA;&#x0301;</span> <span>&#x03AB;&#x0301; &#x03AB;&#x0301;</span> <span>J&#x030C; J&#x030C;</span> <span>H&#x0331; H&#x0331;</span> <span>T&#x0308; T&#x0308;</span> <span>W&#x030A; W&#x030A;</span> <span>Y&#x030A;  Y&#x030A;</span> <span>A&#x02BE; A&#x02BE;</span> <span>&#x03A5;&#x0313; &#x03A5;&#x0313;</span> <span>&#x03A5;&#x0313;&#x0300; &#x03A5;&#x0313;&#x0300;</span> <span>&#x03A5;&#x0313;&#x0301; &#x03A5;&#x0313;&#x0301;</span> <span>&#x03A5;&#x0313;&#x0342; &#x03A5;&#x0313;&#x0342;</span> <span>&#x0391;&#x0342; &#x0391;&#x0342;</span> <span>&#x0397;&#x0342; &#x0397;&#x0342;</span> <span>&#x03AA;&#x0300; &#x03AA;&#x0300;</span> <span>&#x03AA;&#x0301; &#x03AA;&#x0301;</span> <span>&#x0399;&#x0342; &#x0399;&#x0342;</span> <span>&#x03AA;&#x0342; &#x03AA;&#x0342;</span> <span>&#x03AB;&#x0300; &#x03AB;&#x0300;</span> <span>&#x03AB;&#x0301; &#x03AB;&#x0301;</span> <span>&#x03A1;&#x0313; &#x03A1;&#x0313;</span> <span>&#x03A5;&#x0342; &#x03A5;&#x0342;</span> <span>&#x03AB;&#x0342; &#x03AB;&#x0342;</span> <span>&#x03A9;&#x0342; &#x03A9;&#x0342;</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html
index f4fb6804434..f97ce02b561 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html
index f2624f13f63..1d8941c9b0c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html
index 8b784924a14..2502097be21 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html
index 2277c4fe334..ea15bd474f8 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html
index 5c5e18c2f74..ea8325b1850 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html
index 3eed1edb80e..b4590eb88ae 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html
index 0105b021d46..af2673405f3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html
index adcc9a3a5e1..5f915e30193 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html
@@ -11,7 +11,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html
index 30ecf1e199d..5b6f7980ed4 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html
index 52245cb150c..6c8bb587e5e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html
@@ -12,7 +12,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 </style>
 </head>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-001.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-001.html
index 0dfbfb62415..1f41ca4beb8 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-001.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-001.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-003.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-003.html
index ab198975187..2ba726bd139 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-003.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-003.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-005.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-005.html
index ccb130eb535..4279ca6ce87 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-005.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-005.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-007.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-007.html
index 4d15b280d27..6d4e5e432fd 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-007.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-007.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-009.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-009.html
index b835fc7f47e..0e2bdd139fe 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-009.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-009.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-010.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-010.html
index 032a10df47d..fd6cb377e22 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-010.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-010.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-011.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-011.html
index 40b45f24344..eb16d77c770 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-011.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-011.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-014.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-014.html
index 73d5fab0fc8..69550cfb7ac 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-014.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-014.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-016.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-016.html
index 502b24ea6c9..ce2a74bf13b 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-016.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-016.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-018.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-018.html
index 7c86116a9b9..6568a0366c1 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-018.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-018.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 100%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-020.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-020.html
index fd1426cf36e..0b852ba9ec0 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-020.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-020.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-022.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-022.html
index 2c77961741b..aa702810b20 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-022.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-022.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-024.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-024.html
index 2812951a469..891228db895 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-024.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-024.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html
index ee8903a0da7..30e654c5766 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html
index 005e091012d..b274012eb9a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-030.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-030.html
index d5e254803ba..be2a7bb3f40 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-030.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-030.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: capitalize; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-001.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-001.html
index 748bfeaef4b..0174f0c8113 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-001.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-001.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-002.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-002.html
index ef6bda60676..77ec3d4f9fe 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-002.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-002.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-003.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-003.html
index 94526baf8d0..a0381452bc9 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-003.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-003.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-004.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-004.html
index ef7cc5d9c6a..e22775e1b88 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-004.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-004.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-005.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-005.html
index d91a3f1fe69..cc6a04fa7f3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-005.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-005.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-006.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-006.html
index 55704ede654..90388a249f6 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-006.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-006.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-007.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-007.html
index c95830a262c..b2014ee971d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-007.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-007.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-008.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-008.html
index 7ff767daf54..991e0e0e4c1 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-008.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-008.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-009.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-009.html
index a04047d0dff..5e513dcd076 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-009.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-009.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-010.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-010.html
index bf98e32eda5..c214f914871 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-010.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-010.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-011.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-011.html
index ba6fdf14117..4d71b28d606 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-011.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-011.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-012.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-012.html
index e63e319a47f..210551a07db 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-012.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-012.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-014.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-014.html
index cca58f05797..0fbe5e97b03 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-014.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-014.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-015.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-015.html
index 293056303dc..65071771df2 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-015.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-015.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html
index 3a793c7dd88..617e632ab0a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-017.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-017.html
index 32a0e725f9e..a4757edde2d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-017.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-017.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-018.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-018.html
index dcb1fac16ae..ea636e2edae 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-018.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-018.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-019.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-019.html
index d43abbf18a8..1e945a33076 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-019.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-019.html
@@ -16,7 +16,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-020.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-020.html
index b97f25eaf99..8487e688b81 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-020.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-020.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-021.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-021.html
index fdb3c3d4398..ce5125540cf 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-021.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-021.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-022.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-022.html
index cb06c4bd4d5..cdfd7068a38 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-022.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-022.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-023.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-023.html
index 9b1af86b7e6..f79980f39b6 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-023.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-023.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-024.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-024.html
index a8fe5f4af04..0511872c7e1 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-024.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-024.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-025.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-025.html
index 0e9ec6604c3..ce906c08fd6 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-025.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-025.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-026.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-026.html
index f7beb60f044..7694acb7a63 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-026.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-026.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-027.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-027.html
index 8bc19ee5161..3f892c502b4 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-027.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-027.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-028.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-028.html
index b3011f53527..41b7711b264 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-028.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-028.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-029.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-029.html
index 504b64caa99..a18a0c651c3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-029.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-029.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-030.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-030.html
index 745228e110c..635ad682947 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-030.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-030.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-031.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-031.html
index ace5e329e9e..916e978bc24 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-031.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-031.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-032.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-032.html
index 37130efe7b4..df784b0655c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-032.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-032.html
@@ -8,7 +8,7 @@
 <link rel='help' href='https://drafts.csswg.org/css-text-3/#text-transform'>
 <link rel="match" href="reference/text-transform-upperlower-032-ref.html">
 <style type='text/css'>
-.test, .ref { font-size: 200%; line-height: 2.5em; }
+.test, .ref { font-size: 125%; line-height: 1.5em; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
@@ -18,4 +18,4 @@
 <p class="instructions">Test passes if both characters below match.</p>
 <div class="test" lang="de"><span>&#x00DF; SS</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-033.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-033.html
index 9525db2e1f2..fb2973e6556 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-033.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-033.html
@@ -16,7 +16,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
@@ -26,4 +26,4 @@
 <p class="instructions">Test passes if the both characters in each pair match. If you are missing a font glyph for a character, ignore that pair, but report which characters were ignored.</p>
 <div class="test"><span>&#xFB00; FF</span> <span>&#xFB01; FI</span> <span>&#xFB02; FL</span> <span>&#xFB03; FFI</span> <span>&#xFB04; FFL</span> <span>&#xFB05; ST</span> <span>&#xFB06; ST</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-034.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-034.html
index 5751ad5a16d..dc32f3b4c9c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-034.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-034.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Noto Sans Armenian', webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
@@ -24,4 +24,4 @@
 <p class="instructions">Test passes if the both characters in each pair match. If you are missing a font glyph for a character, ignore that pair, but report which characters were ignored.</p>
 <div class="test"><span>&#x0587; &#x0535;&#x0552;</span> <span>&#xFB13; &#x0544;&#x0546;</span> <span>&#xFB14; &#x0544;&#x0535;</span> <span>&#xFB15; &#x0544;&#x053B;</span> <span>&#xFB16; &#x054E;&#x0546;</span> <span>&#xFB17; &#x0544;&#x053D;</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-035.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-035.html
index 0b3398c7c1f..f436582d1d4 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-035.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-035.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Gentium Plus', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
@@ -24,4 +24,4 @@
 <p class="instructions">Test passes if both characters in each pair match. If you are missing a font glyph for a character, ignore that pair, but report which characters were ignored.</p>
 <div class="test"><span>&#x0149; &#x02BC;N</span> <span>&#x0390; &#x03AA;&#x0301;</span> <span>&#x03B0; &#x03AB;&#x0301;</span> <span>&#x01F0; J&#x030C;</span> <span>&#x1E96; H&#x0331;</span> <span>&#x1E97; T&#x0308;</span> <span>&#x1E98; W&#x030A;</span> <span>&#x1E99; Y&#x030A;</span> <span>&#x1E9A; A&#x02BE;</span> <span>&#x1F50; &#x03A5;&#x0313;</span> <span>&#x1F52; &#x03A5;&#x0313;&#x0300;</span> <span>&#x1F54; &#x03A5;&#x0313;&#x0301;</span> <span>&#x1F56; &#x03A5;&#x0313;&#x0342;</span> <span>&#x1FB6; &#x0391;&#x0342;</span> <span>&#x1FC6; &#x0397;&#x0342;</span> <span>&#x1FD2; &#x03AA;&#x0300;</span> <span>&#x1FD3; &#x03AA;&#x0301;</span> <span>&#x1FD6; &#x0399;&#x0342;</span> <span>&#x1FD7; &#x03AA;&#x0342;</span> <span>&#x1FE2; &#x03AB;&#x0300;</span> <span>&#x1FE3; &#x03AB;&#x0301;</span> <span>&#x1FE4; &#x03A1;&#x0313;</span> <span>&#x1FE6; &#x03A5;&#x0342;</span> <span>&#x1FE7; &#x03AB;&#x0342;</span> <span>&#x1FF6; &#x03A9;&#x0342;</span></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-039.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-039.html
index 470a4f6fb54..005d5cb3144 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-039.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-039.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-040.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-040.html
index 0528c78f9d9..c458b53eb3e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-040.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-040.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-041.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-041.html
index 30708b64ff9..b6e30477242 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-041.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-041.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-042.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-042.html
index ffe602f5945..15a777d78db 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-042.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-042.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-043.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-043.html
index d56f6b3ee3b..cc943e56691 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-043.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-043.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html
index 6d81c4540a1..43e678c24b4 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-101.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-101.html
index e4f2ca7d9f5..1b527467a3d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-101.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-101.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-102.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-102.html
index 2eae842e2a8..8c790bcf65c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-102.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-102.html
@@ -14,7 +14,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: webfont, serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: webfont, serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-103.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-103.html
index 07ceb60c3d8..500c877f27d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-103.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-103.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: uppercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-104.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-104.html
index 9d6b2c2bc7d..57a74600585 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-104.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-104.html
@@ -15,7 +15,7 @@
 	font-weight: normal;
 	font-style: normal;
 	}
-.test, .ref { font-size: 200%; line-height: 2.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
+.test, .ref { font-size: 125%; line-height: 1.5em; font-family: 'Doulos SIL', 'Noto Serif', 'Noto Sans', webfont, sans-serif; }
 .test span, .ref span { margin-right: 1em; white-space: nowrap; }
 /* the CSS above is not part of the test */
 .test { text-transform: lowercase; }
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html
new file mode 100644
index 00000000000..e2776669f63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>word-break: break-all on inline element</title>
+<link rel='author' title='Jonathan Kew' href='mailto:jkew@mozilla.com'>
+<style>
+div {
+  border: solid 5px;
+  margin: 5px;
+  font-family: monospace;
+  width: 6.1ch;
+  padding: 1px;
+}
+.test { word-break: break-all; }
+.blue { border-color: blue; }
+.orange { border-color: orange; }
+</style>
+<p>Test passes if the black box is identical to either the blue or the orange one.
+<div class="blue">aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
+<div>aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
+<div class="orange">aaaabb<br>bbbbbb<br>bb<br>bccccc</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html
new file mode 100644
index 00000000000..c9384aace98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>word-break: break-all on inline element</title>
+<link rel='author' title='Jonathan Kew' href='mailto:jkew@mozilla.com'>
+<style>
+div {
+  border: solid 5px;
+  margin: 5px;
+  font-family: monospace;
+  width: 6.1ch;
+  padding: 1px;
+}
+.test { word-break: break-all; }
+.blue { border-color: blue; }
+.orange { border-color: orange; }
+</style>
+<p>Test passes if the black box is identical to either the blue or the orange one.
+<div class="blue">aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
+<div>aaaabb<br>bbbbbb<br>bb<br>bccccc</div>
+<div class="orange">aaaabb<br>bbbbbb<br>bb<br>bccccc</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html
deleted file mode 100644
index 268536c98e0..00000000000
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>word-break: break-all on inline element - reference</title>
-<style>
-.testdiv { font-family: monospace; width: 6.1ch; padding: 1px; margin: 10px; border: 1px solid silver; }
-</style>
-<div>Test passes if the two boxes are the same.</div>
-<div class="testdiv">aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
-<div class="testdiv">aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-006.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-006.html
index 9f9a618ebfe..caf25d94295 100644
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-006.html
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-006.html
@@ -3,18 +3,22 @@
 <title>word-break: break-all on inline element</title>
 <meta name="assert" content="word-break: break-all works when specified on inline element">
 <link rel='help' href='https://drafts.csswg.org/css-text-3/#word-break-property'>
-<link rel='match' href='reference/word-break-break-all-inline-006-ref.html'>
+<link rel='match' href='reference/word-break-break-all-inline-006-a-ref.html'>
+<link rel='match' href='reference/word-break-break-all-inline-006-b-ref.html'>
 <link rel='author' title='Jonathan Kew' href='mailto:jkew@mozilla.com'>
 <style>
-.testdiv { font-family: monospace; width: 6.1ch; padding: 1px; margin: 10px; border: 1px solid silver; }
+div {
+  border: solid 5px;
+  margin: 5px;
+  font-family: monospace;
+  width: 6.1ch;
+  padding: 1px;
+}
 .test { word-break: break-all; }
+.blue { border-color: blue; }
+.orange { border-color: orange; }
 </style>
-<div>Test passes if the two boxes are the same.</div>
-<div class="testdiv">aaaa<span class="test">bbbbbbbbbbb</span>ccccc</div>
-<!--
-Some browsers may decide to break before the last 'b', which is still conformant from the spec
-perspective. However, this test would fail in that case. Current spec states that behavior is
-undefined in the boundaries of the inline-box. See https://github.com/web-platform-tests/wpt/issues/19903
-and https://github.com/w3c/csswg-drafts/issues/3897 for details.
--->
-<div class="testdiv">aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
+<p>Test passes if the black box is identical to either the blue or the orange one.
+<div class="blue">aaaabb<br>bbbbbb<br>bbb<br>ccccc</div>
+<div>aaaa<span class="test">bbbbbbbbbbb</span>ccccc</div>
+<div class="orange">aaaabb<br>bbbbbb<br>bb<br>bccccc</div>
diff --git a/tests/wpt/web-platform-tests/css/cssom/cssimportrule-parent.html b/tests/wpt/web-platform-tests/css/cssom/cssimportrule-parent.html
new file mode 100644
index 00000000000..2792af69c0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/cssimportrule-parent.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>CSSImportRule correctly unlinks its child stylesheet from its parent</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/cssom/#the-cssimportrule-interface">
+<style>
+  @import "data:text/css,:root{background:red}";
+</style>
+<script>
+let t = async_test("@import stylesheet is properly unlinked from parent after removal");
+window.onload = t.step_func_done(function() {
+  let sheet = document.styleSheets[0];
+  let childSheet = sheet.cssRules[0].styleSheet;
+  assert_not_equals(childSheet, null, "@import rule should have a stylesheet");
+  assert_equals(childSheet.parentStyleSheet, sheet, "@import rule should the correct parent");
+  sheet.deleteRule(0);
+  assert_equals(childSheet.parentStyleSheet, null, "@import rule should be correctly unlinked");
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/cssimportrule-sheet-identity.html b/tests/wpt/web-platform-tests/css/cssom/cssimportrule-sheet-identity.html
new file mode 100644
index 00000000000..3db5634ebe5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/cssimportrule-sheet-identity.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<title>CSSImportRule has different sheets even if referencing the same URL</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/cssom/#the-cssimportrule-interface">
+<link rel="stylesheet" href="support/import-rule.css">
+<link rel="stylesheet" href="support/import-rule.css">
+<script>
+let t = async_test("CSSImportRule has different sheets even if referencing the same URL");
+window.onload = t.step_func_done(function() {
+  let sheet1 = document.styleSheets[0];
+  let sheet2 = document.styleSheets[1];
+
+  assert_not_equals(sheet1, sheet2);
+
+  let childSheet1 = sheet1.cssRules[0].styleSheet;
+  let childSheet2 = sheet2.cssRules[0].styleSheet;
+
+  assert_not_equals(childSheet1, null);
+  assert_not_equals(childSheet2, null);
+  assert_not_equals(childSheet1, childSheet2, "@import pointing to the same URL shouldn't point to the same StyleSheet object");
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/support/import-rule.css b/tests/wpt/web-platform-tests/css/cssom/support/import-rule.css
new file mode 100644
index 00000000000..5edcef7e691
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/support/import-rule.css
@@ -0,0 +1 @@
+@import "import-red.css";
diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html b/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html
deleted file mode 100644
index 2b3f512e381..00000000000
--- a/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_feature_policy.tentative.sub.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<body>
-  <script src=/resources/testharness.js></script>
-  <script src=/resources/testharnessreport.js></script>
-  <script src=/feature-policy/resources/featurepolicy.js></script>
-  <script>
-    run_all_fp_tests_allow_all(
-      'http://{{domains[www]}}:{{ports[http][0]}}',
-      'document-access',
-      'SecurityError',
-      () => {
-        return new Promise((resolve, reject) => {
-        try {
-            var iframe = document.createElement('iframe');
-            iframe.srcdoc ="<p>same origin iframe</p>";
-            document.documentElement.append(iframe);
-
-            // attempt to access something in a same origin iframe that would
-            // should be prevented by the feature policy.
-            iframe.contentWindow.location.href;
-            resolve();
-          } catch(e) {
-            reject(e);
-          }
-       });
-      });
-  </script>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_parent_access.tentative.html b/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_parent_access.tentative.html
index 9a06d1beb4a..07b27a5c4ae 100644
--- a/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_parent_access.tentative.html
+++ b/tests/wpt/web-platform-tests/html/browsers/windows/document-access/document_access_parent_access.tentative.html
@@ -2,7 +2,7 @@
 <body>
   <script src=/resources/testharness.js></script>
   <script src=/resources/testharnessreport.js></script>
-  <iframe allow="document-access 'none'" src="resources/child.html"></iframe>
+  <iframe disallowdocumentaccess src="resources/child.html"></iframe>
   <script>
     async_test(function (t) {
       // Ensure post message works correctly.
diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html b/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html
index dcee4c16a07..279f70d4903 100644
--- a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html
+++ b/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html
@@ -26,10 +26,11 @@ async_test(t => {
       t.events.push('scroll');
     }));
 
-    w.requestAnimationFrame(t.step_func_done(() => {
+    w.requestAnimationFrame(
+        () => w.requestAnimationFrame(t.step_func_done(() => {
       t.events.push('animationFrame');
       assert_array_equals(t.events, ['autofocus', 'scroll', 'animationFrame'], t.events);
-    }));
+    })));
 
     w.document.body.appendChild(element);
   }));
diff --git a/tests/wpt/web-platform-tests/import-maps/common/README.md b/tests/wpt/web-platform-tests/import-maps/common/README.md
new file mode 100644
index 00000000000..cda42d06099
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/README.md
@@ -0,0 +1,79 @@
+# Import maps test JSON format
+
+In this directory, test inputs and expectations are expressed as JSON files.
+This is in order to share the same JSON files between WPT tests and Jest-based
+tests for the reference JavaScript implementation at [WICG repository](https://github.com/WICG/import-maps/tree/master/reference-implementation).
+
+## Basics
+
+A **test object** describes a set of parameters (import maps and base URLs) and specifiers to be tested.
+Each JSON file under [resources/](resources/) directory consists of a test object.
+A minimum test object would be:
+
+```json
+{
+  "name": "Main test name",
+  "importMapBaseURL": "https://example.com/import-map-base-url/index.html",
+  "importMap": {
+    "imports": {
+      "a": "/mapped-a.mjs"
+    }
+  },
+  "baseURL": "https://example.com/base-url/app.mjs",
+  "expectedResults": {
+    "a": "https://example.com/mapped-a.mjs",
+    "b": null
+  }
+}
+```
+
+Required fields:
+
+- `name`: Test name.
+    - In WPT tests, this is used for the test name of `promise_test()` together with specifier to be resolved, like `"Main test name: a"`.
+- `importMap` (object or string): the import map to be attached.
+- `importMapBaseURL` (string): the base URL used for [parsing the import map](https://wicg.github.io/import-maps/#parse-an-import-map-string).
+- `baseURL` (string): the base URL used in [resolving a specifier](https://wicg.github.io/import-maps/#resolve-a-module-specifier) for each specifiers.
+- `expectedResults` (object; string to (string or null)): test cases.
+    - The keys are specifiers to be resolved.
+    - The values are expected resolved URLs. If `null`, resolution should fail.
+
+Optional fields:
+
+- `link` and `details` can be used for e.g. linking to specs or adding more detailed descriptions.
+    - Currently they are simply ignored by the WPT test helper.
+
+## Nesting and inheritance
+
+We can organize tests by nesting test objects.
+A test object can contain child test objects (*subtests*) using `tests` field.
+The Keys of the `tests` value are the names of subtests, and values are test objects.
+
+For example:
+
+```json
+{
+  "name": "Main test name",
+  "importMapBaseURL": "https://example.com/import-map-base-url/index.html",
+  "importMap": {
+    "imports": {
+      "a": "/mapped-a.mjs"
+    }
+  },
+  "tests": {
+    "Subtest1": {
+      "baseURL": "https://example.com/base-url1/app.mjs",
+      "expectedResults": { "a": "https://example.com/mapped-a.mjs" }
+    },
+    "Subtest2": {
+      "baseURL": "https://example.com/base-url2/app.mjs",
+      "expectedResults": { "b": null }
+    }
+  }
+}
+```
+
+The top-level test object contains two sub test objects, named as `Subtest1` and `Subtest2`, respectively.
+
+Child test objects inherit fields from their parent test object.
+In the example above, the child test objects specifies `baseURL` fields, while they inherits other fields (e.g. `importMapBaseURL`) from the top-level test object.
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.html b/tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.html
new file mode 100644
index 00000000000..c947232e063
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/common-test-helper.js";
+
+for (const json of [
+  'resources/scopes.json',
+  'resources/empty-import-map.json',
+  'resources/packages-via-trailing-slashes.json',
+  'resources/tricky-specifiers.json',
+  'resources/url-specifiers.json',
+  'resources/data-base-url.json',
+  'resources/scopes-exact-vs-prefix.json',
+  'resources/overlapping-entries.json',
+]) {
+  promise_test(() =>
+    runTestsFromJSON(json),
+    "Test helper: fetching and sanity checking test JSON: " + json);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js b/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
new file mode 100644
index 00000000000..002c4b51fd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
@@ -0,0 +1,163 @@
+setup({allow_uncaught_exception : true});
+
+// Creates a new Document (via <iframe>) and add an inline import map.
+function parse(importMap, importMapBaseURL) {
+  return new Promise((resolve, reject) => {
+    const importMapString = JSON.stringify(importMap);
+    const iframe = document.createElement('iframe');
+
+    window.addEventListener('message', event => {
+        if (event.data.type === 'Success') {
+          resolve(iframe);
+        } else {
+          // Currently we don't distinguish fetch errors and parse errors.
+          reject(event.data.error);
+        }
+      },
+      {once: true});
+
+    const testHTML = `
+      <script>
+      // Handle errors around fetching, parsing and registering import maps.
+      let registrationResult;
+      const onScriptError = event => {
+        registrationResult = {type: 'FetchError', error: event.error};
+        return false;
+      };
+      const windowErrorHandler = event => {
+        registrationResult = {type: 'ParseError', error: event.error};
+        return false;
+      };
+      window.addEventListener('error', windowErrorHandler);
+      window.addEventListener('load', event => {
+        if (!registrationResult) {
+          registrationResult = {type: 'Success'};
+        }
+        window.removeEventListener('error', windowErrorHandler);
+        parent.postMessage(registrationResult, '*');
+      });
+
+      // Handle specifier resolution requests from the parent frame.
+      window.addEventListener('message', event => {
+        try {
+          // URL resolution is tested using Chromium's internals.
+          // TODO(hiroshige): Remove the Chromium-specific dependency.
+          const result = internals.resolveModuleSpecifier(
+              event.data.specifier,
+              event.data.baseURL,
+              document);
+          parent.postMessage({type: 'ResolutionSuccess', result: result}, '*');
+        } catch (e) {
+          // We post error names instead of error objects themselves and
+          // re-create error objects later, to avoid issues around serializing
+          // error objects which is a quite new feature.
+          parent.postMessage({type: 'ResolutionFailure', result: e.name}, '*');
+        }
+      });
+      </script>
+      <script type="importmap" onerror="onScriptError(event)">
+      ${importMapString}
+      </script>
+    `;
+
+    if (new URL(importMapBaseURL).protocol === 'data:') {
+      iframe.src = 'data:text/html;base64,' + btoa(testHTML);
+    } else {
+      iframe.srcdoc = `<base href="${importMapBaseURL}">` + testHTML;
+    }
+
+    document.body.appendChild(iframe);
+
+  });
+}
+
+// Returns a promise that is resolved with the resulting URL.
+function resolve(specifier, parsedImportMap, baseURL) {
+  return new Promise((resolve, reject) => {
+    window.addEventListener('message', event => {
+        if (event.data.type === 'ResolutionSuccess') {
+          resolve(event.data.result);
+        } else if (event.data.type === 'ResolutionFailure') {
+          if (event.data.result === 'TypeError') {
+            reject(new TypeError());
+          } else {
+            reject(new Error(event.data.result));
+          }
+        } else {
+          assert_unreached('Invalid message: ' + event.data.type);
+        }
+      },
+      {once: true});
+
+    parsedImportMap.contentWindow.postMessage(
+        {specifier: specifier, baseURL: baseURL}, '*');
+  });
+}
+
+function assert_no_extra_properties(object, expectedProperties, description) {
+  for (const actualProperty in object) {
+    assert_true(expectedProperties.indexOf(actualProperty) !== -1,
+        description + ": unexpected property " + actualProperty);
+  }
+}
+
+async function runTests(j) {
+  const tests = j.tests;
+  delete j.tests;
+
+  if (j.importMap) {
+    assert_own_property(j, 'importMap');
+    assert_own_property(j, 'importMapBaseURL');
+    j.parsedImportMap = await parse(j.importMap, j.importMapBaseURL);
+    delete j.importMap;
+    delete j.importMapBaseURL;
+  }
+
+  assert_no_extra_properties(
+      j,
+      ['expectedResults', 'baseURL', 'name', 'parsedImportMap',
+      'importMap', 'importMapBaseURL',
+      'link', 'details'],
+      j.name);
+
+  if (tests) {
+    // Nested node.
+    for (const testName in tests) {
+      let fullTestName = testName;
+      if (j.name) {
+        fullTestName = j.name + ': ' + testName;
+      }
+      tests[testName].name = fullTestName;
+      const k = Object.assign(Object.assign({}, j), tests[testName]);
+      await runTests(k);
+    }
+  } else {
+    // Leaf node.
+    for (const key of
+        ['expectedResults', 'parsedImportMap', 'baseURL', 'name']) {
+      assert_own_property(j, key, j.name);
+    }
+
+    for (const specifier in j.expectedResults) {
+      const expected = j.expectedResults[specifier];
+      promise_test(async t => {
+          if (expected === null) {
+            return promise_rejects(t, new TypeError(),
+                resolve(specifier, j.parsedImportMap, j.baseURL));
+          } else {
+            // Should be resolved to `expected`.
+            const actual = await resolve(
+                specifier, j.parsedImportMap, j.baseURL);
+            assert_equals(actual, expected);
+          }
+        },
+        j.name + ': ' + specifier);
+    }
+  }
+}
+
+export async function runTestsFromJSON(jsonURL) {
+  const response = await fetch(jsonURL);
+  const json = await response.json();
+  await runTests(json);
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/data-base-url.json b/tests/wpt/web-platform-tests/import-maps/common/resources/data-base-url.json
new file mode 100644
index 00000000000..81fcf087425
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/data-base-url.json
@@ -0,0 +1,17 @@
+{
+  "importMap": {
+    "imports": {
+      "foo/": "data:text/javascript,foo/"
+    }
+  },
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "data: base URL (?)",
+  "tests": {
+    "should favor the most-specific key": {
+      "expectedResults": {
+        "foo/bar": null
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map.json b/tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map.json
new file mode 100644
index 00000000000..ce6c185498f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map.json
@@ -0,0 +1,56 @@
+{
+  "importMap": {},
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "tests": {
+    "valid relative specifiers": {
+      "expectedResults": {
+        "./foo": "https://example.com/js/foo",
+        "./foo/bar": "https://example.com/js/foo/bar",
+        "./foo/../bar": "https://example.com/js/bar",
+        "./foo/../../bar": "https://example.com/bar",
+        "../foo": "https://example.com/foo",
+        "../foo/bar": "https://example.com/foo/bar",
+        "../../../foo/bar": "https://example.com/foo/bar",
+        "/foo": "https://example.com/foo",
+        "/foo/bar": "https://example.com/foo/bar",
+        "/../../foo/bar": "https://example.com/foo/bar",
+        "/../foo/../bar": "https://example.com/bar"
+      }
+    },
+    "fetch scheme absolute URLs": {
+      "expectedResults": {
+        "about:fetch-scheme": "about:fetch-scheme",
+        "https://fetch-scheme.net": "https://fetch-scheme.net/",
+        "https:fetch-scheme.org": "https://fetch-scheme.org/",
+        "https://fetch%2Dscheme.com/": "https://fetch-scheme.com/",
+        "https://///fetch-scheme.com///": "https://fetch-scheme.com///"
+      }
+    },
+    "non-fetch scheme absolute URLs": {
+      "expectedResults": {
+        "mailto:non-fetch-scheme": "mailto:non-fetch-scheme",
+        "import:non-fetch-scheme": "import:non-fetch-scheme",
+        "javascript:non-fetch-scheme": "javascript:non-fetch-scheme",
+        "wss:non-fetch-scheme": "wss://non-fetch-scheme/"
+      }
+    },
+    "valid relative URLs that are invalid as specifiers should fail": {
+      "expectedResults": {
+        "invalid-specifier": null,
+        "\\invalid-specifier": null,
+        ":invalid-specifier": null,
+        "@invalid-specifier": null,
+        "%2E/invalid-specifier": null,
+        "%2E%2E/invalid-specifier": null,
+        ".%2Finvalid-specifier": null
+      }
+    },
+    "invalid absolute URLs should fail": {
+      "expectedResults": {
+        "https://invalid-url.com:demo": null,
+        "http://[invalid-url.com]/": null
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/overlapping-entries.json b/tests/wpt/web-platform-tests/import-maps/common/resources/overlapping-entries.json
new file mode 100644
index 00000000000..21354025451
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/overlapping-entries.json
@@ -0,0 +1,25 @@
+{
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "should favor the most-specific key",
+  "tests": {
+    "Overlapping entries with trailing slashes": {
+      "importMap": {
+        "imports": {
+          "a": "/1",
+          "a/": "/2/",
+          "a/b": "/3",
+          "a/b/": "/4/"
+        }
+      },
+      "expectedResults": {
+        "a": "https://example.com/1",
+        "a/": "https://example.com/2/",
+        "a/x": "https://example.com/2/x",
+        "a/b": "https://example.com/3",
+        "a/b/": "https://example.com/4/",
+        "a/b/c": "https://example.com/4/c"
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/packages-via-trailing-slashes.json b/tests/wpt/web-platform-tests/import-maps/common/resources/packages-via-trailing-slashes.json
new file mode 100644
index 00000000000..6b8f0135f50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/packages-via-trailing-slashes.json
@@ -0,0 +1,43 @@
+{
+  "importMap": {
+    "imports": {
+      "moment": "/node_modules/moment/src/moment.js",
+      "moment/": "/node_modules/moment/src/",
+      "lodash-dot": "./node_modules/lodash-es/lodash.js",
+      "lodash-dot/": "./node_modules/lodash-es/",
+      "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
+      "lodash-dotdot/": "../node_modules/lodash-es/"
+    }
+  },
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "Package-like scenarios",
+  "link": "https://github.com/WICG/import-maps#packages-via-trailing-slashes",
+  "tests": {
+    "package main modules": {
+      "expectedResults": {
+        "moment": "https://example.com/node_modules/moment/src/moment.js",
+        "lodash-dot": "https://example.com/app/node_modules/lodash-es/lodash.js",
+        "lodash-dotdot": "https://example.com/node_modules/lodash-es/lodash.js"
+      }
+    },
+    "package submodules": {
+      "expectedResults": {
+        "moment/foo": "https://example.com/node_modules/moment/src/foo",
+        "lodash-dot/foo": "https://example.com/app/node_modules/lodash-es/foo",
+        "lodash-dotdot/foo": "https://example.com/node_modules/lodash-es/foo"
+      }
+    },
+    "package names that end in a slash should just pass through": {
+      "expectedResults": {
+        "moment/": "https://example.com/node_modules/moment/src/"
+      }
+    },
+    "package modules that are not declared should fail": {
+      "expectedResults": {
+        "underscore/": null,
+        "underscore/foo": null
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/scopes-exact-vs-prefix.json b/tests/wpt/web-platform-tests/import-maps/common/resources/scopes-exact-vs-prefix.json
new file mode 100644
index 00000000000..3d9d50349f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/scopes-exact-vs-prefix.json
@@ -0,0 +1,134 @@
+{
+  "name": "Exact vs. prefix based matching",
+  "details": "Scopes are matched with base URLs that are exactly the same or subpaths under the scopes with trailing shashes",
+  "link": "https://wicg.github.io/import-maps/#resolve-a-module-specifier Step 8.1",
+  "tests": {
+    "Scope without trailing slash only": {
+      "importMap": {
+        "scopes": {
+          "/js": {
+            "moment": "/only-triggered-by-exact/moment",
+            "moment/": "/only-triggered-by-exact/moment/"
+          }
+        }
+      },
+      "importMapBaseURL": "https://example.com/app/index.html",
+      "tests": {
+        "Non-trailing-slash base URL (exact match)": {
+          "baseURL": "https://example.com/js",
+          "expectedResults": {
+            "moment": "https://example.com/only-triggered-by-exact/moment",
+            "moment/foo": "https://example.com/only-triggered-by-exact/moment/foo"
+          }
+        },
+        "Trailing-slash base URL (fail)": {
+          "baseURL": "https://example.com/js/",
+          "expectedResults": {
+            "moment": null,
+            "moment/foo": null
+          }
+        },
+        "Subpath base URL (fail)": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "moment": null,
+            "moment/foo": null
+          }
+        },
+        "Non-subpath base URL (fail)": {
+          "baseURL": "https://example.com/jsiscool",
+          "expectedResults": {
+            "moment": null,
+            "moment/foo": null
+          }
+        }
+      }
+    },
+    "Scope with trailing slash only": {
+      "importMap": {
+        "scopes": {
+          "/js/": {
+            "moment": "/triggered-by-any-subpath/moment",
+            "moment/": "/triggered-by-any-subpath/moment/"
+          }
+        }
+      },
+      "importMapBaseURL": "https://example.com/app/index.html",
+      "tests": {
+        "Non-trailing-slash base URL (fail)": {
+          "baseURL": "https://example.com/js",
+          "expectedResults": {
+            "moment": null,
+            "moment/foo": null
+          }
+        },
+        "Trailing-slash base URL (exact match)": {
+          "baseURL": "https://example.com/js/",
+          "expectedResults": {
+            "moment": "https://example.com/triggered-by-any-subpath/moment",
+            "moment/foo": "https://example.com/triggered-by-any-subpath/moment/foo"
+          }
+        },
+        "Subpath base URL (prefix match)": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "moment": "https://example.com/triggered-by-any-subpath/moment",
+            "moment/foo": "https://example.com/triggered-by-any-subpath/moment/foo"
+          }
+        },
+        "Non-subpath base URL (fail)": {
+          "baseURL": "https://example.com/jsiscool",
+          "expectedResults": {
+            "moment": null,
+            "moment/foo": null
+          }
+        }
+      }
+    },
+    "Scopes with and without trailing slash": {
+      "importMap": {
+        "scopes": {
+          "/js": {
+            "moment": "/only-triggered-by-exact/moment",
+            "moment/": "/only-triggered-by-exact/moment/"
+          },
+          "/js/": {
+            "moment": "/triggered-by-any-subpath/moment",
+            "moment/": "/triggered-by-any-subpath/moment/"
+          }
+        }
+      },
+      "importMapBaseURL": "https://example.com/app/index.html",
+      "tests": {
+        "Non-trailing-slash base URL (exact match)": {
+          "baseURL": "https://example.com/js",
+          "expectedResults": {
+            "moment": "https://example.com/only-triggered-by-exact/moment",
+            "moment/foo": "https://example.com/only-triggered-by-exact/moment/foo"
+          }
+        },
+        "Trailing-slash base URL (exact match)": {
+          "baseURL": "https://example.com/js/",
+          "expectedResults": {
+            "moment": "https://example.com/triggered-by-any-subpath/moment",
+            "moment/foo": "https://example.com/triggered-by-any-subpath/moment/foo"
+          }
+        },
+        "Subpath base URL (prefix match)": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "moment": "https://example.com/triggered-by-any-subpath/moment",
+            "moment/foo": "https://example.com/triggered-by-any-subpath/moment/foo"
+          }
+        },
+        "Non-subpath base URL (fail)": {
+          "baseURL": "https://example.com/jsiscool",
+          "expectedResults": {
+            "moment": null,
+            "moment/foo": null
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/scopes.json b/tests/wpt/web-platform-tests/import-maps/common/resources/scopes.json
new file mode 100644
index 00000000000..c266e4c6c1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/scopes.json
@@ -0,0 +1,171 @@
+{
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "tests": {
+    "Fallback to toplevel and between scopes": {
+      "importMap": {
+        "imports": {
+          "a": "/a-1.mjs",
+          "b": "/b-1.mjs",
+          "c": "/c-1.mjs",
+          "d": "/d-1.mjs"
+        },
+        "scopes": {
+          "/scope2/": {
+            "a": "/a-2.mjs",
+            "d": "/d-2.mjs"
+          },
+          "/scope2/scope3/": {
+            "b": "/b-3.mjs",
+            "d": "/d-3.mjs"
+          }
+        }
+      },
+      "tests": {
+        "should fall back to `imports` when no scopes match": {
+          "baseURL": "https://example.com/scope1/foo.mjs",
+          "expectedResults": {
+            "a": "https://example.com/a-1.mjs",
+            "b": "https://example.com/b-1.mjs",
+            "c": "https://example.com/c-1.mjs",
+            "d": "https://example.com/d-1.mjs"
+          }
+        },
+        "should use a direct scope override": {
+          "baseURL": "https://example.com/scope2/foo.mjs",
+          "expectedResults": {
+            "a": "https://example.com/a-2.mjs",
+            "b": "https://example.com/b-1.mjs",
+            "c": "https://example.com/c-1.mjs",
+            "d": "https://example.com/d-2.mjs"
+          }
+        },
+        "should use an indirect scope override": {
+          "baseURL": "https://example.com/scope2/scope3/foo.mjs",
+          "expectedResults": {
+            "a": "https://example.com/a-2.mjs",
+            "b": "https://example.com/b-3.mjs",
+            "c": "https://example.com/c-1.mjs",
+            "d": "https://example.com/d-3.mjs"
+          }
+        }
+      }
+    },
+    "Relative URL scope keys": {
+      "importMap": {
+        "imports": {
+          "a": "/a-1.mjs",
+          "b": "/b-1.mjs",
+          "c": "/c-1.mjs"
+        },
+        "scopes": {
+          "": {
+            "a": "/a-empty-string.mjs"
+          },
+          "./": {
+            "b": "/b-dot-slash.mjs"
+          },
+          "../": {
+            "c": "/c-dot-dot-slash.mjs"
+          }
+        }
+      },
+      "tests": {
+        "An empty string scope is a scope with import map base URL": {
+          "baseURL": "https://example.com/app/index.html",
+          "expectedResults": {
+            "a": "https://example.com/a-empty-string.mjs",
+            "b": "https://example.com/b-dot-slash.mjs",
+            "c": "https://example.com/c-dot-dot-slash.mjs"
+          }
+        },
+        "'./' scope is a scope with import map base URL's directory": {
+          "baseURL": "https://example.com/app/foo.mjs",
+          "expectedResults": {
+            "a": "https://example.com/a-1.mjs",
+            "b": "https://example.com/b-dot-slash.mjs",
+            "c": "https://example.com/c-dot-dot-slash.mjs"
+          }
+        },
+        "'../' scope is a scope with import map base URL's parent directory": {
+          "baseURL": "https://example.com/foo.mjs",
+          "expectedResults": {
+            "a": "https://example.com/a-1.mjs",
+            "b": "https://example.com/b-1.mjs",
+            "c": "https://example.com/c-dot-dot-slash.mjs"
+          }
+        }
+      }
+    },
+    "Package-like scenarios": {
+      "importMap": {
+        "imports": {
+          "moment": "/node_modules/moment/src/moment.js",
+          "moment/": "/node_modules/moment/src/",
+          "lodash-dot": "./node_modules/lodash-es/lodash.js",
+          "lodash-dot/": "./node_modules/lodash-es/",
+          "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
+          "lodash-dotdot/": "../node_modules/lodash-es/"
+        },
+        "scopes": {
+          "/": {
+            "moment": "/node_modules_3/moment/src/moment.js",
+            "vue": "/node_modules_3/vue/dist/vue.runtime.esm.js"
+          },
+          "/js/": {
+            "lodash-dot": "./node_modules_2/lodash-es/lodash.js",
+            "lodash-dot/": "./node_modules_2/lodash-es/",
+            "lodash-dotdot": "../node_modules_2/lodash-es/lodash.js",
+            "lodash-dotdot/": "../node_modules_2/lodash-es/"
+          }
+        }
+      },
+      "tests": {
+        "Base URLs inside the scope should use the scope if the scope has matching keys": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "lodash-dot": "https://example.com/app/node_modules_2/lodash-es/lodash.js",
+            "lodash-dot/foo": "https://example.com/app/node_modules_2/lodash-es/foo",
+            "lodash-dotdot": "https://example.com/node_modules_2/lodash-es/lodash.js",
+            "lodash-dotdot/foo": "https://example.com/node_modules_2/lodash-es/foo"
+          }
+        },
+        "Base URLs inside the scope fallback to less specific scope": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "moment": "https://example.com/node_modules_3/moment/src/moment.js",
+            "vue": "https://example.com/node_modules_3/vue/dist/vue.runtime.esm.js"
+          }
+        },
+        "Base URLs inside the scope fallback to toplevel": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "moment/foo": "https://example.com/node_modules/moment/src/foo"
+          }
+        },
+        "Base URLs outside a scope shouldn't use the scope even if the scope has matching keys": {
+          "baseURL": "https://example.com/app.mjs",
+          "expectedResults": {
+            "lodash-dot": "https://example.com/app/node_modules/lodash-es/lodash.js",
+            "lodash-dotdot": "https://example.com/node_modules/lodash-es/lodash.js",
+            "lodash-dot/foo": "https://example.com/app/node_modules/lodash-es/foo",
+            "lodash-dotdot/foo": "https://example.com/node_modules/lodash-es/foo"
+          }
+        },
+        "Fallback to toplevel or not, depending on trailing slash match": {
+          "baseURL": "https://example.com/app.mjs",
+          "expectedResults": {
+            "moment": "https://example.com/node_modules_3/moment/src/moment.js",
+            "moment/foo": "https://example.com/node_modules/moment/src/foo"
+          }
+        },
+        "should still fail for package-like specifiers that are not declared": {
+          "baseURL": "https://example.com/js/app.mjs",
+          "expectedResults": {
+            "underscore/": null,
+            "underscore/foo": null
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/tricky-specifiers.json b/tests/wpt/web-platform-tests/import-maps/common/resources/tricky-specifiers.json
new file mode 100644
index 00000000000..d9c80c94750
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/tricky-specifiers.json
@@ -0,0 +1,43 @@
+{
+  "importMap": {
+    "imports": {
+      "package/withslash": "/node_modules/package-with-slash/index.mjs",
+      "not-a-package": "/lib/not-a-package.mjs",
+      "only-slash/": "/lib/only-slash/",
+      ".": "/lib/dot.mjs",
+      "..": "/lib/dotdot.mjs",
+      "..\\": "/lib/dotdotbackslash.mjs",
+      "%2E": "/lib/percent2e.mjs",
+      "%2F": "/lib/percent2f.mjs"
+    }
+  },
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "Tricky specifiers",
+  "tests": {
+    "explicitly-mapped specifiers that happen to have a slash": {
+      "expectedResults": {
+        "package/withslash": "https://example.com/node_modules/package-with-slash/index.mjs"
+      }
+    },
+    "specifier with punctuation": {
+      "expectedResults": {
+        ".": "https://example.com/lib/dot.mjs",
+        "..": "https://example.com/lib/dotdot.mjs",
+        "..\\": "https://example.com/lib/dotdotbackslash.mjs",
+        "%2E": "https://example.com/lib/percent2e.mjs",
+        "%2F": "https://example.com/lib/percent2f.mjs"
+      }
+    },
+    "submodule of something not declared with a trailing slash should fail": {
+      "expectedResults": {
+        "not-a-package/foo": null
+      }
+    },
+    "module for which only a trailing-slash version is present should fail": {
+      "expectedResults": {
+        "only-slash": null
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/url-specifiers.json b/tests/wpt/web-platform-tests/import-maps/common/resources/url-specifiers.json
new file mode 100644
index 00000000000..aff55c4d9dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/url-specifiers.json
@@ -0,0 +1,52 @@
+{
+  "importMap": {
+    "imports": {
+      "/lib/foo.mjs": "./more/bar.mjs",
+      "./dotrelative/foo.mjs": "/lib/dot.mjs",
+      "../dotdotrelative/foo.mjs": "/lib/dotdot.mjs",
+      "/": "/lib/slash-only/",
+      "./": "/lib/dotslash-only/",
+      "/test/": "/lib/url-trailing-slash/",
+      "./test/": "/lib/url-trailing-slash-dot/",
+      "/test": "/lib/test1.mjs",
+      "../test": "/lib/test2.mjs"
+    }
+  },
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "URL-like specifiers",
+  "tests": {
+    "Ordinal URL-like specifiers": {
+      "expectedResults": {
+        "https://example.com/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
+        "https://///example.com/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
+        "/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
+        "https://example.com/app/dotrelative/foo.mjs": "https://example.com/lib/dot.mjs",
+        "../app/dotrelative/foo.mjs": "https://example.com/lib/dot.mjs",
+        "https://example.com/dotdotrelative/foo.mjs": "https://example.com/lib/dotdot.mjs",
+        "../dotdotrelative/foo.mjs": "https://example.com/lib/dotdot.mjs"
+      }
+    },
+    "Import map entries just composed from / and .": {
+      "expectedResults": {
+        "https://example.com/": "https://example.com/lib/slash-only/",
+        "/": "https://example.com/lib/slash-only/",
+        "../": "https://example.com/lib/slash-only/",
+        "https://example.com/app/": "https://example.com/lib/dotslash-only/",
+        "/app/": "https://example.com/lib/dotslash-only/",
+        "../app/": "https://example.com/lib/dotslash-only/"
+      }
+    },
+    "prefix-matched by keys with trailing slashes": {
+      "expectedResults": {
+        "/test/foo.mjs": "https://example.com/lib/url-trailing-slash/foo.mjs",
+        "https://example.com/app/test/foo.mjs": "https://example.com/lib/url-trailing-slash-dot/foo.mjs"
+      }
+    },
+    "should use the last entry's address when URL-like specifiers parse to the same absolute URL": {
+      "expectedResults": {
+        "/test": "https://example.com/lib/test2.mjs"
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/tools/format_json.py b/tests/wpt/web-platform-tests/import-maps/common/tools/format_json.py
new file mode 100644
index 00000000000..2808a37906e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/tools/format_json.py
@@ -0,0 +1,27 @@
+import collections
+import json
+import sys
+import traceback
+"""
+Simple JSON formatter, to be used for JSON files under resources/.
+
+Usage:
+$ python tools/format_json.py resources/*.json
+"""
+
+
+def main():
+    for filename in sys.argv[1:]:
+        print filename
+        try:
+            spec = json.load(
+                open(filename, 'r'), object_pairs_hook=collections.OrderedDict)
+            with open(filename, 'w') as f:
+                f.write(json.dumps(spec, indent=2, separators=(',', ': ')))
+                f.write('\n')
+        except:
+            traceback.print_exc()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resolving-scopes.tentative.html b/tests/wpt/web-platform-tests/import-maps/imported/resolving-scopes.tentative.html
deleted file mode 100644
index 4985249f4e2..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resolving-scopes.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-scopes.js
--->
-<script type="module" src="resources/resolving-scopes.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resolving.tentative.html b/tests/wpt/web-platform-tests/import-maps/imported/resolving.tentative.html
deleted file mode 100644
index 339026259b0..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resolving.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving.js
--->
-<script type="module" src="resources/resolving.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/resolving-scopes.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/resolving-scopes.js
deleted file mode 100644
index d133b50bd2b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/resolving-scopes.js
+++ /dev/null
@@ -1,222 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return (specifier, baseURL) => resolve(specifier, map, baseURL);
-}
-
-describe('Mapped using scope instead of "imports"', () => {
-  const jsNonDirURL = new URL('https://example.com/js');
-  const jsPrefixedURL = new URL('https://example.com/jsiscool');
-  const inJSDirURL = new URL('https://example.com/js/app.mjs');
-  const topLevelURL = new URL('https://example.com/app.mjs');
-
-  describe('Exact vs. prefix based matching', () => {
-    it('should match correctly when both are in the map', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "scopes": {
-          "/js": {
-            "moment": "/only-triggered-by-exact/moment",
-            "moment/": "/only-triggered-by-exact/moment/"
-          },
-          "/js/": {
-            "moment": "/triggered-by-any-subpath/moment",
-            "moment/": "/triggered-by-any-subpath/moment/"
-          }
-        }
-      }`);
-
-      expect(resolveUnderTest('moment', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment');
-      expect(resolveUnderTest('moment/foo', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment/foo');
-
-      expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment');
-      expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment/foo');
-
-      expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError);
-    });
-
-    it('should match correctly when only an exact match is in the map', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "scopes": {
-          "/js": {
-            "moment": "/only-triggered-by-exact/moment",
-            "moment/": "/only-triggered-by-exact/moment/"
-          }
-        }
-      }`);
-
-      expect(resolveUnderTest('moment', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment');
-      expect(resolveUnderTest('moment/foo', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment/foo');
-
-      expect(() => resolveUnderTest('moment', inJSDirURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', inJSDirURL)).toThrow(TypeError);
-
-      expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError);
-    });
-
-    it('should match correctly when only a prefix match is in the map', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "scopes": {
-          "/js/": {
-            "moment": "/triggered-by-any-subpath/moment",
-            "moment/": "/triggered-by-any-subpath/moment/"
-          }
-        }
-      }`);
-
-      expect(() => resolveUnderTest('moment', jsNonDirURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsNonDirURL)).toThrow(TypeError);
-
-      expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment');
-      expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment/foo');
-
-      expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError);
-    });
-  });
-
-  describe('Package-like scenarios', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": "/node_modules/moment/src/moment.js",
-        "moment/": "/node_modules/moment/src/",
-        "lodash-dot": "./node_modules/lodash-es/lodash.js",
-        "lodash-dot/": "./node_modules/lodash-es/",
-        "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-        "lodash-dotdot/": "../node_modules/lodash-es/"
-      },
-      "scopes": {
-        "/": {
-          "moment": "/node_modules_3/moment/src/moment.js",
-          "vue": "/node_modules_3/vue/dist/vue.runtime.esm.js"
-        },
-        "/js/": {
-          "lodash-dot": "./node_modules_2/lodash-es/lodash.js",
-          "lodash-dot/": "./node_modules_2/lodash-es/",
-          "lodash-dotdot": "../node_modules_2/lodash-es/lodash.js",
-          "lodash-dotdot/": "../node_modules_2/lodash-es/"
-        }
-      }
-    }`);
-
-    it('should resolve scoped', () => {
-      expect(resolveUnderTest('lodash-dot', inJSDirURL)).toMatchURL('https://example.com/app/node_modules_2/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot', inJSDirURL)).toMatchURL('https://example.com/node_modules_2/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dot/foo', inJSDirURL)).toMatchURL('https://example.com/app/node_modules_2/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo', inJSDirURL)).toMatchURL('https://example.com/node_modules_2/lodash-es/foo');
-    });
-
-    it('should apply best scope match', () => {
-      expect(resolveUnderTest('moment', topLevelURL)).toMatchURL('https://example.com/node_modules_3/moment/src/moment.js');
-      expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/node_modules_3/moment/src/moment.js');
-      expect(resolveUnderTest('vue', inJSDirURL)).toMatchURL('https://example.com/node_modules_3/vue/dist/vue.runtime.esm.js');
-    });
-
-    it('should fallback to "imports"', () => {
-      expect(resolveUnderTest('moment/foo', topLevelURL)).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('lodash-dot', topLevelURL)).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot', topLevelURL)).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dot/foo', topLevelURL)).toMatchURL('https://example.com/app/node_modules/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo', topLevelURL)).toMatchURL('https://example.com/node_modules/lodash-es/foo');
-    });
-
-    it('should still fail for package-like specifiers that are not declared', () => {
-      expect(() => resolveUnderTest('underscore/', inJSDirURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('underscore/foo', inJSDirURL)).toThrow(TypeError);
-    });
-  });
-
-  describe('The scope inheritance example from the README', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "a": "/a-1.mjs",
-        "b": "/b-1.mjs",
-        "c": "/c-1.mjs",
-        "d": "/d-1.mjs"
-      },
-      "scopes": {
-        "/scope2/": {
-          "a": "/a-2.mjs",
-          "d": "/d-2.mjs"
-        },
-        "/scope2/scope3/": {
-          "b": "/b-3.mjs",
-          "d": "/d-3.mjs"
-        }
-      }
-    }`);
-
-    const scope1URL = new URL('https://example.com/scope1/foo.mjs');
-    const scope2URL = new URL('https://example.com/scope2/foo.mjs');
-    const scope3URL = new URL('https://example.com/scope2/scope3/foo.mjs');
-
-    it('should fall back to "imports" when none match', () => {
-      expect(resolveUnderTest('a', scope1URL)).toMatchURL('https://example.com/a-1.mjs');
-      expect(resolveUnderTest('b', scope1URL)).toMatchURL('https://example.com/b-1.mjs');
-      expect(resolveUnderTest('c', scope1URL)).toMatchURL('https://example.com/c-1.mjs');
-      expect(resolveUnderTest('d', scope1URL)).toMatchURL('https://example.com/d-1.mjs');
-    });
-
-    it('should use a direct scope override', () => {
-      expect(resolveUnderTest('a', scope2URL)).toMatchURL('https://example.com/a-2.mjs');
-      expect(resolveUnderTest('b', scope2URL)).toMatchURL('https://example.com/b-1.mjs');
-      expect(resolveUnderTest('c', scope2URL)).toMatchURL('https://example.com/c-1.mjs');
-      expect(resolveUnderTest('d', scope2URL)).toMatchURL('https://example.com/d-2.mjs');
-    });
-
-    it('should use an indirect scope override', () => {
-      expect(resolveUnderTest('a', scope3URL)).toMatchURL('https://example.com/a-2.mjs');
-      expect(resolveUnderTest('b', scope3URL)).toMatchURL('https://example.com/b-3.mjs');
-      expect(resolveUnderTest('c', scope3URL)).toMatchURL('https://example.com/c-1.mjs');
-      expect(resolveUnderTest('d', scope3URL)).toMatchURL('https://example.com/d-3.mjs');
-    });
-  });
-
-  describe('Relative URL scope keys', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "a": "/a-1.mjs",
-        "b": "/b-1.mjs",
-        "c": "/c-1.mjs"
-      },
-      "scopes": {
-        "": {
-          "a": "/a-empty-string.mjs"
-        },
-        "./": {
-          "b": "/b-dot-slash.mjs"
-        },
-        "../": {
-          "c": "/c-dot-dot-slash.mjs"
-        }
-      }
-    }`);
-    const inSameDirAsMap = new URL('./foo.mjs', mapBaseURL);
-    const inDirAboveMap = new URL('../foo.mjs', mapBaseURL);
-
-    it('should resolve an empty string scope using the import map URL', () => {
-      expect(resolveUnderTest('a', mapBaseURL)).toMatchURL('https://example.com/a-empty-string.mjs');
-      expect(resolveUnderTest('a', inSameDirAsMap)).toMatchURL('https://example.com/a-1.mjs');
-    });
-
-    it('should resolve a ./ scope using the import map URL\'s directory', () => {
-      expect(resolveUnderTest('b', mapBaseURL)).toMatchURL('https://example.com/b-dot-slash.mjs');
-      expect(resolveUnderTest('b', inSameDirAsMap)).toMatchURL('https://example.com/b-dot-slash.mjs');
-    });
-
-    it('should resolve a ../ scope using the import map URL\'s directory', () => {
-      expect(resolveUnderTest('c', mapBaseURL)).toMatchURL('https://example.com/c-dot-dot-slash.mjs');
-      expect(resolveUnderTest('c', inSameDirAsMap)).toMatchURL('https://example.com/c-dot-dot-slash.mjs');
-      expect(resolveUnderTest('c', inDirAboveMap)).toMatchURL('https://example.com/c-dot-dot-slash.mjs');
-    });
-  });
-});
-
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/resolving.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/resolving.js
deleted file mode 100644
index ef8a4f87d25..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/resolving.js
+++ /dev/null
@@ -1,232 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-const scriptURL = new URL('https://example.com/js/app.mjs');
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return specifier => resolve(specifier, map, scriptURL);
-}
-
-describe('Unmapped', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{}`);
-
-  it('should resolve ./ specifiers as URLs', () => {
-    expect(resolveUnderTest('./foo')).toMatchURL('https://example.com/js/foo');
-    expect(resolveUnderTest('./foo/bar')).toMatchURL('https://example.com/js/foo/bar');
-    expect(resolveUnderTest('./foo/../bar')).toMatchURL('https://example.com/js/bar');
-    expect(resolveUnderTest('./foo/../../bar')).toMatchURL('https://example.com/bar');
-  });
-
-  it('should resolve ../ specifiers as URLs', () => {
-    expect(resolveUnderTest('../foo')).toMatchURL('https://example.com/foo');
-    expect(resolveUnderTest('../foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('../../../foo/bar')).toMatchURL('https://example.com/foo/bar');
-  });
-
-  it('should resolve / specifiers as URLs', () => {
-    expect(resolveUnderTest('/foo')).toMatchURL('https://example.com/foo');
-    expect(resolveUnderTest('/foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('/../../foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('/../foo/../bar')).toMatchURL('https://example.com/bar');
-  });
-
-  it('should parse absolute fetch-scheme URLs', () => {
-    expect(resolveUnderTest('about:good')).toMatchURL('about:good');
-    expect(resolveUnderTest('https://example.net')).toMatchURL('https://example.net/');
-    expect(resolveUnderTest('https://ex%41mple.com/')).toMatchURL('https://example.com/');
-    expect(resolveUnderTest('https:example.org')).toMatchURL('https://example.org/');
-    expect(resolveUnderTest('https://///example.com///')).toMatchURL('https://example.com///');
-  });
-
-  it('should parse absolute non-fetch-scheme URLs', () => {
-    expect(resolveUnderTest('mailto:bad')).toMatchURL('mailto:bad');
-    expect(resolveUnderTest('import:bad')).toMatchURL('import:bad');
-    expect(resolveUnderTest('javascript:bad')).toMatchURL('javascript:bad');
-    expect(resolveUnderTest('wss:bad')).toMatchURL('wss://bad/');
-  });
-
-  it('should fail for strings not parseable as absolute URLs and not starting with ./ ../ or /', () => {
-    expect(() => resolveUnderTest('foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('\\foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest(':foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('@foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('%2E/foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('%2E%2E/foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('.%2Ffoo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('https://ex ample.org/')).toThrow(TypeError);
-    expect(() => resolveUnderTest('https://example.com:demo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('http://[www.example.com]/')).toThrow(TypeError);
-  });
-});
-
-describe('Mapped using the "imports" key only (no scopes)', () => {
-  describe('Package-like scenarios', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": "/node_modules/moment/src/moment.js",
-        "moment/": "/node_modules/moment/src/",
-        "lodash-dot": "./node_modules/lodash-es/lodash.js",
-        "lodash-dot/": "./node_modules/lodash-es/",
-        "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-        "lodash-dotdot/": "../node_modules/lodash-es/"
-      }
-    }`);
-
-    it('should work for package main modules', () => {
-      expect(resolveUnderTest('moment')).toMatchURL('https://example.com/node_modules/moment/src/moment.js');
-      expect(resolveUnderTest('lodash-dot')).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot')).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js');
-    });
-
-    it('should work for package submodules', () => {
-      expect(resolveUnderTest('moment/foo')).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('lodash-dot/foo')).toMatchURL('https://example.com/app/node_modules/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo')).toMatchURL('https://example.com/node_modules/lodash-es/foo');
-    });
-
-    it('should work for package names that end in a slash by just passing through', () => {
-      // TODO: is this the right behavior, or should we throw?
-      expect(resolveUnderTest('moment/')).toMatchURL('https://example.com/node_modules/moment/src/');
-    });
-
-    it('should still fail for package modules that are not declared', () => {
-      expect(() => resolveUnderTest('underscore/')).toThrow(TypeError);
-      expect(() => resolveUnderTest('underscore/foo')).toThrow(TypeError);
-    });
-  });
-
-  describe('Tricky specifiers', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "package/withslash": "/node_modules/package-with-slash/index.mjs",
-        "not-a-package": "/lib/not-a-package.mjs",
-        "only-slash/": "/lib/only-slash/",
-        ".": "/lib/dot.mjs",
-        "..": "/lib/dotdot.mjs",
-        "..\\\\": "/lib/dotdotbackslash.mjs",
-        "%2E": "/lib/percent2e.mjs",
-        "%2F": "/lib/percent2f.mjs"
-      }
-    }`);
-
-    it('should work for explicitly-mapped specifiers that happen to have a slash', () => {
-      expect(resolveUnderTest('package/withslash')).toMatchURL('https://example.com/node_modules/package-with-slash/index.mjs');
-    });
-
-    it('should work when the specifier has punctuation', () => {
-      expect(resolveUnderTest('.')).toMatchURL('https://example.com/lib/dot.mjs');
-      expect(resolveUnderTest('..')).toMatchURL('https://example.com/lib/dotdot.mjs');
-      expect(resolveUnderTest('..\\')).toMatchURL('https://example.com/lib/dotdotbackslash.mjs');
-      expect(resolveUnderTest('%2E')).toMatchURL('https://example.com/lib/percent2e.mjs');
-      expect(resolveUnderTest('%2F')).toMatchURL('https://example.com/lib/percent2f.mjs');
-    });
-
-    it('should fail for attempting to get a submodule of something not declared with a trailing slash', () => {
-      expect(() => resolveUnderTest('not-a-package/foo')).toThrow(TypeError);
-    });
-
-    it('should fail for attempting to get a module if only a trailing-slash version is present', () => {
-      expect(() => resolveUnderTest('only-slash')).toThrow(TypeError);
-    });
-  });
-
-  describe('URL-like specifiers', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "/lib/foo.mjs": "./more/bar.mjs",
-        "./dotrelative/foo.mjs": "/lib/dot.mjs",
-        "../dotdotrelative/foo.mjs": "/lib/dotdot.mjs",
-
-        "/": "/lib/slash-only/",
-        "./": "/lib/dotslash-only/",
-
-        "/test/": "/lib/url-trailing-slash/",
-        "./test/": "/lib/url-trailing-slash-dot/",
-
-        "/test": "/lib/test1.mjs",
-        "../test": "/lib/test2.mjs"
-      }
-    }`);
-
-    it('should remap to other URLs', () => {
-      expect(resolveUnderTest('https://example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-      expect(resolveUnderTest('https://///example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-      expect(resolveUnderTest('/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-
-      expect(resolveUnderTest('https://example.com/app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs');
-      expect(resolveUnderTest('../app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs');
-
-      expect(resolveUnderTest('https://example.com/dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs');
-      expect(resolveUnderTest('../dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs');
-    });
-
-    it('should remap URLs that are just composed from / and .', () => {
-      expect(resolveUnderTest('https://example.com/')).toMatchURL('https://example.com/lib/slash-only/');
-      expect(resolveUnderTest('/')).toMatchURL('https://example.com/lib/slash-only/');
-      expect(resolveUnderTest('../')).toMatchURL('https://example.com/lib/slash-only/');
-
-      expect(resolveUnderTest('https://example.com/app/')).toMatchURL('https://example.com/lib/dotslash-only/');
-      expect(resolveUnderTest('/app/')).toMatchURL('https://example.com/lib/dotslash-only/');
-      expect(resolveUnderTest('../app/')).toMatchURL('https://example.com/lib/dotslash-only/');
-    });
-
-    it('should remap URLs that are prefix-matched by keys with trailing slashes', () => {
-      expect(resolveUnderTest('/test/foo.mjs')).toMatchURL('https://example.com/lib/url-trailing-slash/foo.mjs');
-      expect(resolveUnderTest('https://example.com/app/test/foo.mjs')).toMatchURL('https://example.com/lib/url-trailing-slash-dot/foo.mjs');
-    });
-
-    it('should use the last entry\'s address when URL-like specifiers parse to the same absolute URL', () => {
-      expect(resolveUnderTest('/test')).toMatchURL('https://example.com/lib/test2.mjs');
-    });
-  });
-
-  describe('Overlapping entries with trailing slashes', () => {
-    it('should favor the most-specific key', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "imports": {
-          "a": "/1",
-          "a/": "/2/",
-          "a/b": "/3",
-          "a/b/": "/4/"
-        }
-      }`);
-
-      expect(resolveUnderTest('a')).toMatchURL('https://example.com/1');
-      expect(resolveUnderTest('a/')).toMatchURL('https://example.com/2/');
-      expect(resolveUnderTest('a/b')).toMatchURL('https://example.com/3');
-      expect(resolveUnderTest('a/b/')).toMatchURL('https://example.com/4/');
-      expect(resolveUnderTest('a/b/c')).toMatchURL('https://example.com/4/c');
-    });
-
-    it('should favor the most-specific key when there are no mappings for less-specific keys', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "imports": {
-          "a/b": "/3",
-          "a/b/": "/4/"
-        }
-      }`);
-
-      expect(() => resolveUnderTest('a')).toThrow(TypeError);
-      expect(() => resolveUnderTest('a/')).toThrow(TypeError);
-      expect(() => resolveUnderTest('a/x')).toThrow(TypeError);
-      expect(resolveUnderTest('a/b')).toMatchURL('https://example.com/3');
-      expect(resolveUnderTest('a/b/')).toMatchURL('https://example.com/4/');
-      expect(resolveUnderTest('a/b/c')).toMatchURL('https://example.com/4/c');
-      expect(() => resolveUnderTest('a/x/c')).toThrow(TypeError);
-    });
-  });
-
-  it('should deal with data: URL bases', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "foo/": "data:text/javascript,foo/"
-      }
-    }`);
-
-    expect(() => resolveUnderTest('foo/bar')).toThrow(TypeError);
-  });
-});
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/set_permission.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/set_permission.html.ini
new file mode 100644
index 00000000000..9a250edf1a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/set_permission.html.ini
@@ -0,0 +1,3 @@
+[set_permission.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/set_permission.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/set_permission.html
new file mode 100644
index 00000000000..1e92a26398d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/set_permission.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver set_permission method</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script>
+promise_test(t => {
+  return test_driver.set_permission("ambient-light-sensor", "granted", true);
+}, "Grant Permission for one realm");
+
+promise_test(t => {
+  return test_driver.set_permission("ambient-light-sensor", "denied");
+}, "Deny Permission, omit one realm");
+</script>
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index 4f2ef9c005b..a1b3f63650c 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -677,6 +677,7 @@ MISSING-LINK: css/filter-effects/*.any.js
 # Tests that use WebKit/Blink testing APIs
 LAYOUTTESTS APIS: css/css-regions/interactivity/*
 LAYOUTTESTS APIS: import-maps/resources/jest-test-helper.js
+LAYOUTTESTS APIS: import-maps/common/resources/common-test-helper.js
 LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js
 LAYOUTTESTS APIS: resources/chromium/nfc-mock.js
 LAYOUTTESTS APIS: resources/chromium/webxr-test.js
diff --git a/tests/wpt/web-platform-tests/longtask-timing/containerTypes.html b/tests/wpt/web-platform-tests/longtask-timing/containerTypes.html
new file mode 100644
index 00000000000..94daab793c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/longtask-timing/containerTypes.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>LongTask Timing: long tasks in various containers</title>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Longtasks in iframe, frame, object, and embed</h1>
+<div id="log"></div>
+<script>
+function Container(name, src) {
+    this.name = name;
+    this.src = src;
+}
+const Containers = [
+    new Container('iframe', 'src'),
+    new Container('frame', 'src'),
+    new Container('object', 'data'),
+    new Container('embed', 'src'),
+];
+Containers.forEach(container => {
+  promise_test(async t => {
+    assert_precondition(window.PerformanceLongTaskTiming, 'Longtasks are not supported.');
+    const initialTime = performance.now();
+    return new Promise(resolve => {
+      const observer = new PerformanceObserver(t.step_func(entryList => {
+        const entries = entryList.getEntries();
+        assert_equals(entries.length, 1,
+          'Exactly one entry is expected.');
+        const longtask = entries[0];
+        assert_equals(longtask.entryType, 'longtask');
+        if (longtask.name == 'self' ||
+            longtask.name == 'multiple-contexts' ||
+            longtask.name == 'unknown')
+          return;
+        assert_equals(longtask.name, 'same-origin-descendant');
+        assert_greater_than(longtask.duration, 50);
+        assert_greater_than_equal(longtask.startTime, initialTime);
+        const currentTime = performance.now();
+        assert_less_than_equal(longtask.startTime, currentTime);
+        // Assert the TaskAttributionTiming entry in attribution.
+        assert_equals(longtask.attribution.length, 1,
+          'Exactly one attribution entry is expected');
+        const attribution = longtask.attribution[0];
+        assert_equals(attribution.entryType, 'taskattribution');
+        assert_equals(attribution.name, 'unknown');
+        assert_equals(attribution.duration, 0);
+        assert_equals(attribution.startTime, 0);
+        assert_equals(attribution.containerId, container.name + '-id');
+        assert_equals(attribution.containerName, container.name + '-name');
+        assert_equals(attribution.containerSrc, 'resources/subframe-with-longtask.html');
+        observer.disconnect();
+        resolve();
+      }));
+      observer.observe({entryTypes: ['longtask']});
+      const containerObject = document.createElement(container.name);
+      containerObject.id = container.name + '-id';
+      containerObject.name = container.name + '-name';
+      containerObject[container.src] = 'resources/subframe-with-longtask.html';
+      document.body.appendChild(containerObject);
+    });
+  }, `Performance longtask entries in ${container.name} are observable in parent.`);
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-attributes.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-attributes.html
index b5d44b0db5d..8e0da824a87 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-attributes.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-attributes.html
@@ -35,6 +35,7 @@
             assert_equals(attribution.name, 'unknown');
             assert_equals(attribution.duration, 0);
             assert_equals(attribution.startTime, 0);
+            assert_equals(attribution.containerType, 'window');
             assert_equals(attribution.containerId, '');
             assert_equals(attribution.containerName, '');
             assert_equals(attribution.containerSrc, '');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe-crossorigin.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe-crossorigin.html
index aaabce5d79d..149cf93e869 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe-crossorigin.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe-crossorigin.html
@@ -36,6 +36,7 @@
             assert_equals(attribution.name, 'unknown');
             assert_equals(attribution.duration, 0);
             assert_equals(attribution.startTime, 0);
+            assert_equals(attribution.containerType, 'iframe');
             assert_equals(attribution.containerId, 'child-iframe-id');
             assert_equals(attribution.containerName, 'child-iframe-name');
             assert_equals(attribution.containerSrc,
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe.html
index 34b802cb696..432ead57597 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe.html
@@ -41,6 +41,7 @@
             assert_equals(attribution.name, 'unknown');
             assert_equals(attribution.duration, 0);
             assert_equals(attribution.startTime, 0);
+            assert_equals(attribution.containerType, 'iframe');
             assert_equals(attribution.containerId, 'child-iframe-id');
             assert_equals(attribution.containerName, 'child-iframe-name');
             assert_equals(attribution.containerSrc, 'resources/subframe-with-longtask.html');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-externalscript.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-externalscript.html
index 076f0f22914..57c2d5650c0 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-externalscript.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-externalscript.html
@@ -32,6 +32,7 @@
             assert_equals(attribution.name, 'unknown');
             assert_equals(attribution.duration, 0);
             assert_equals(attribution.startTime, 0);
+            assert_equals(attribution.containerType, 'window');
             assert_equals(attribution.containerId, '');
             assert_equals(attribution.containerName, '');
             assert_equals(attribution.containerSrc, '');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-parentiframe.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-parentiframe.html
index 778edc1000f..2da635467a2 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-parentiframe.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-parentiframe.html
@@ -16,6 +16,7 @@
       assert_equals(e.data['entryType'], 'longtask');
       assert_equals(e.data['frame-attribution'], 'same-origin-ancestor');
       assert_equals(e.data['task-attribution'], 'unknown');
+      assert_equals(e.data['containerType'], 'window');
       assert_equals(e.data['containerId'], '');
       assert_equals(e.data['containerName'], '');
       assert_equals(e.data['containerSrc'], '');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html
index 2d30ac36b96..88ad2ef9892 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html
@@ -32,6 +32,7 @@
             assert_equals(attribution.name, 'unknown');
             assert_equals(attribution.duration, 0);
             assert_equals(attribution.startTime, 0);
+            assert_equals(attribution.containerType, 'window');
             assert_equals(attribution.containerId, '');
             assert_equals(attribution.containerName, '');
             assert_equals(attribution.containerSrc, '');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html
index b73112e3abf..653556333a1 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html
@@ -16,6 +16,7 @@
       assert_equals(e.data['entryType'], 'longtask');
       assert_equals(e.data['frame-attribution'], 'cross-origin-unreachable');
       assert_equals(e.data['task-attribution'], 'unknown');
+      assert_equals(e.data['containerType'], 'window');
       assert_equals(e.data['containerId'], '');
       assert_equals(e.data['containerName'], '');
       assert_equals(e.data['containerSrc'], '');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe.html
index 16f0998c223..280d387654b 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe.html
@@ -20,6 +20,7 @@
 
       assert_equals(e.data['frame-attribution'], 'same-origin');
       assert_equals(e.data['task-attribution'], 'unknown');
+      assert_equals(e.data['containerType'], 'iframe');
       assert_equals(e.data['containerId'], 'longtask-iframe-id');
       assert_equals(e.data['containerName'], 'longtask-iframe-name');
       assert_equals(e.data['containerSrc'], 'resources/subframe-with-longtask.html');
diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/subframe-observing-longtask.html b/tests/wpt/web-platform-tests/longtask-timing/resources/subframe-observing-longtask.html
index b232ecdd47a..125ff1e4cb5 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/resources/subframe-observing-longtask.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/resources/subframe-observing-longtask.html
@@ -19,6 +19,7 @@
           'entryType': longtask.entryType,
           'frame-attribution': longtask.name,
           'task-attribution': attribution.name,
+          'containerType': attribution.containerType,
           'containerId': attribution.containerId,
           'containerName': attribution.containerName,
           'containerSrc': attribution.containerSrc
diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js b/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js
index 67b90d9db65..e624f14ff69 100644
--- a/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js
+++ b/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js
@@ -17,6 +17,12 @@ var minimalAudioConfiguration = {
   contentType: 'audio/webm; codecs="opus"',
 };
 
+// AudioConfiguration with optional spatialRendering param.
+var audioConfigurationWithSpatialRendering = {
+  contentType: 'audio/webm; codecs="opus"',
+  spatialRendering: true,
+};
+
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo());
 }, "Test that decodingInfo rejects if it doesn't get a configuration");
@@ -296,3 +302,15 @@ async_test(t => {
     }
   }), t.unreached_func('Promise.all should not reject for valid types'));
 }, "Test that decodingInfo rejects if the MediaConfiguration does not have a valid type");
+
+promise_test(t => {
+  return navigator.mediaCapabilities.decodingInfo({
+    type: 'file',
+    audio: audioConfigurationWithSpatialRendering,
+  }).then(ability => {
+    assert_equals(typeof ability.supported, "boolean");
+    assert_equals(typeof ability.smooth, "boolean");
+    assert_equals(typeof ability.powerEfficient, "boolean");
+    assert_equals(typeof ability.keySystemAccess, "object");
+  });
+}, "Test that decodingInfo with spatialRendering set returns a valid MediaCapabilitiesInfo objects");
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.html
index 2e3d0c99872..6cf8779ab0b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'copy';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js
index 89e2328ae93..aa0f39dd2bc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'copy';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html
index aaef24f23ba..b086a5429ba 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-atop';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js
index 0b1ac5cca6a..18785d75070 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-atop';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html
index b9b2d6bde25..402f2c3931a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-in';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js
index 45ba1a78293..a2e403bf77b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-in';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html
index 3e20486f579..bccc50aea39 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-out';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js
index 995369115e2..3ae91e39592 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-out';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html
index abf90de0234..8128e110834 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-over';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js
index df2d2ba93c1..35827d4ea9b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.destination-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'destination-over';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.html
index bceccf77512..20083b57585 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'lighter';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js
index 85d813da363..474c299d1a2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.lighter.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'lighter';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html
index 04c9d002b5d..16fb9fb3c87 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-atop';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js
index 97ee55b20fc..689152ae6f4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-atop';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.html
index 61c96a3e8a2..bf69b2dc0a1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-in';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js
index 4699b7815ec..d68068bd9f5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-in';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.html
index fe6419237da..21514d32e5d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-out';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js
index 9e6394d0fc7..f30bcd16399 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-out';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.html
index 0a049e262b1..54810af7f95 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-over';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js
index 9bde016866d..5a90aedc2c7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.source-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'source-over';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.html
index 0b719cea313..1c5ada787d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'xor';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js
index d22235d8c57..16d1e9be9b0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.canvas.xor.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.globalCompositeOperation = 'xor';
     ctx.drawImage(offscreenCanvas2, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.html
index 5c9a8ab5240..8f0caa44ead 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.worker.js
index ed5c04321b7..256964a0a64 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.html
index a709a5f40ae..7b2842d21ec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.worker.js
index 0889147f69d..b40b8f15acd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.html
index d15a40c2734..6ad4bc4b53f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.worker.js
index ae8ba85cd36..edc0e987a55 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.html
index e4fc3c8c502..3d3e66ba665 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.worker.js
index 73632f52776..5c6a37a4241 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.html
index bb344369d65..f817b38804c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.worker.js
index 1c623febc34..cb13b3d5e24 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.destination-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.html
index 5f6ed79c566..007966e0c17 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.worker.js
index 1e04a502ecf..840d10f9135 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.lighter.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.html
index 80bd5225836..2b00001e69d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.worker.js
index f42cd0e3b68..daf5e960b2d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.html
index ed7e89a79b1..6809c809f57 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.worker.js
index b4455821bad..81e8ec19eda 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.html
index ff480843f0f..a1c9c3c6b1b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.worker.js
index 5d51255ac51..4fbea5c2be2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.html
index 08bce563a92..836806f29a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.worker.js
index 79b67d89917..cf04b1e38aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.source-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.html
index 6f65ca6f0b8..ca34cce9c04 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.worker.js
index 8c4f98d2bed..3bf92d6e13e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.clip.xor.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() does not affect pixels outside the clip region.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.html
index f9263c9ffe8..fe982ac3e95 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.worker.js
index 0e1b75d1792..d03a459b843 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.html
index e14bdd39754..ea0b1d9bbb4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.globalCompositeOperation = 'copy'
 ctx.globalAlpha = 0.51;
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,130, "50,25", "0,255,0,130", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.worker.js
index 6c102092886..05c44c7084b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvascopy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.globalCompositeOperation = 'copy'
 ctx.globalAlpha = 0.51;
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,130, "50,25", "0,255,0,130", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.html
index b38efda6cba..11b270f4124 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillStyle = ctx.createPattern(offscreenCanvas2, 'no-repeat');
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.worker.js
index 47229cf99bb..96b00924983 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.canvaspattern.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = ctx.createPattern(offscreenCanvas2, 'no-repeat');
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html
index d3d9e49269c..19739b8783f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.globalAlpha, 1.0, "ctx.globalAlpha", "1.0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js
index f68310dc1fb..b1226b8a2fe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.globalAlpha, 1.0, "ctx.globalAlpha", "1.0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.html
index ad9ffcb4391..1b7615bef14 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.worker.js
index e3d15e755cc..aacc43c4459 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.fill.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html
index ad1c1dae6f3..2f7a5e684da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js
index a6e2be45225..143d2ee3a24 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,9 +31,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html
index 283f5831acd..c577b5bf9e9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ promise.then(function(response) {
     ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
     ctx.fillRect(0, 0, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js
index ae0547b5ade..cc765b4731e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ promise.then(function(response) {
     ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
     ctx.fillRect(0, 0, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html
index 5ddb6d0caff..02297758c75 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.globalAlpha = -Infinity;
 _assertSame(ctx.globalAlpha, a, "ctx.globalAlpha", "a");
 ctx.globalAlpha = NaN;
 _assertSame(ctx.globalAlpha, a, "ctx.globalAlpha", "a");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js
index 6bfcabb3742..1ab33e9c5bc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.globalAlpha = -Infinity;
 _assertSame(ctx.globalAlpha, a, "ctx.globalAlpha", "a");
 ctx.globalAlpha = NaN;
 _assertSame(ctx.globalAlpha, a, "ctx.globalAlpha", "a");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html
index 957df9b5c1e..8bc440d7036 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.globalAlpha = 0;
 _assertSame(ctx.globalAlpha, 0, "ctx.globalAlpha", "0");
 ctx.globalAlpha = 1;
 _assertSame(ctx.globalAlpha, 1, "ctx.globalAlpha", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js
index 235fb7bd2aa..5038d63da0c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.globalAlpha = 0;
 _assertSame(ctx.globalAlpha, 0, "ctx.globalAlpha", "0");
 ctx.globalAlpha = 1;
 _assertSame(ctx.globalAlpha, 1, "ctx.globalAlpha", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.html
index 370b31601eb..322f6cfd0a7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.worker.js
index b982ff537aa..b6f84256907 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.html
index 618a279657a..3c54ac26fb5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js
index e1be28b69bd..48f472bee8c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.html
index 6f197c961c9..1edbcdcf46f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js
index 749780e0247..622b35b7946 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.html
index c39f8c1e373..e1d0cbad8ce 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js
index a68cc6f014f..52c142efc7e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.html
index 41dd506b844..c591a6559f1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js
index 059b61b53e3..fb200df3ff4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.html
index a9b4aa9e37d..4ba8cf7d39c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js
index 10d7df9c696..212446e5126 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.html
index 9ca0ed6f12e..15e057dbe57 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js
index b270ccf4f33..82ca5794e46 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.html
index 7b40b06b239..b8190d3662d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js
index de4ed372db4..9169f57986d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.html
index 690f922b0f8..7a305ba7d88 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js
index e6316cfc8d2..56cc13e6c13 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.html
index a384d623fa4..5a3a67647b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js
index 0ab6fc00a42..210af01ba54 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.html
index 896061f3b8e..b40cda82e8a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.worker.js
index 717e42e8085..ed6b7df3eee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.image.xor.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html
index f0a2eb6b3a7..41d31287f71 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'Source-over';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js
index 32014ffe074..fa0b602fdde 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'Source-over';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.html
index 9c80b14de40..746ab260b59 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'clear';
 _assertSame(ctx.globalCompositeOperation, 'clear', "ctx.globalCompositeOperation", "'clear'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js
index a5a2c51f6cd..7149fe93af6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'clear';
 _assertSame(ctx.globalCompositeOperation, 'clear', "ctx.globalCompositeOperation", "'clear'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.html
index 572178b0018..161611dab9d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'darker';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js
index 64ee8fc062c..6b8e304fd9f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'darker';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.html
index 6bdf2622fb5..aadfb5dc61c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.globalCompositeOperation, 'source-over', "ctx.globalCompositeOperation", "'source-over'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.worker.js
index 768e79b8a27..2ad80a646b5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.globalCompositeOperation, 'source-over', "ctx.globalCompositeOperation", "'source-over'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.html
index ec7c85fdddc..6e7ab55572a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ for (var i = 0; i < modes.length; ++i)
     ctx.globalCompositeOperation = modes[i];
     _assertSame(ctx.globalCompositeOperation, modes[i], "ctx.globalCompositeOperation", "modes[\""+(i)+"\"]");
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.worker.js
index 065ce859330..46cee0b9f17 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.get.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ for (var i = 0; i < modes.length; ++i)
     ctx.globalCompositeOperation = modes[i];
     _assertSame(ctx.globalCompositeOperation, modes[i], "ctx.globalCompositeOperation", "modes[\""+(i)+"\"]");
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.html
index 78ca4c87d2d..04e324fbfcf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'highlight';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js
index 549cfe1fda6..b5417f06dc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'highlight';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html
index 5fc50ff4003..32a0c667c84 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'source-over\0';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js
index f3e4d79107f..594f42eb9e9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'source-over\0';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.html
index 2040c8f645c..73909f32650 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'over';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.worker.js
index f4cceea613e..b3813f2366b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'over';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html
index 7d736b9d159..ab2baf4ec10 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'nonexistent';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js
index 9b36e731dc4..4e8db415a47 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'nonexistent';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.html
index 02c34f08d26..d7a55e786cd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'copy';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.worker.js
index 26f7749bbac..18149873c70 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'copy';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.html
index 17171240df1..4048e691601 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-atop';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.worker.js
index 7ca89e45878..0de20958710 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-atop';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.html
index 182e2b882a7..0741d410e85 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-in';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.worker.js
index 086e51ec193..0e9d93a2723 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-in';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.html
index 90aac468cb1..7732e44150d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-out';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js
index 3ee4417205a..eaecaaaa3e9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-out';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.html
index 044142b9ad3..fe38837c3ed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-over';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.worker.js
index 2a19cf9d933..ab2b9d703b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.destination-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-over';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.html
index 5ea174083ff..69ac5353848 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'lighter';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.worker.js
index 73839b745a2..a81e34004d2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.lighter.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'lighter';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.html
index 734236c9937..5923799a7ef 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-atop';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.worker.js
index cf7f9944cf7..a335eaecf02 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-atop';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.html
index 19d11b2477b..e2f338e4c48 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-in';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.worker.js
index 32e5295f113..c33628614ba 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-in';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.html
index a7bb00e17b5..bc240c20bd8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-out';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js
index 21d4a1c9e3b..a57554a4415 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-out';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.html
index 5b005ba4e84..9e9bc9d1e09 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-over';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.worker.js
index ea3c26818b1..aac5bbed02b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.source-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-over';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.html
index 438fb71767b..47df726038f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'xor';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js
index c518948cb90..66df263b950 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'xor';
 ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.html
index b0aacaf2a6b..dd3390ee266 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'copy';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.worker.js
index 5d8643ebca3..67627238d34 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'copy';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.html
index f8615d4f1aa..feb3beb656e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-atop';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,128,128,191, "50,25", "0,128,128,191", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.worker.js
index df418045300..ece0e5cf195 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-atop';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,128,128,191, "50,25", "0,128,128,191", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.html
index 2b30d98af35..d094aee3ff4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-in';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,96, "50,25", "0,255,0,96", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.worker.js
index 0b78e0c2447..67c6b5f8190 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-in';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,96, "50,25", "0,255,0,96", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.html
index ad90c7b4519..176e50dd196 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-out';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,32, "50,25", "0,255,0,32", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.worker.js
index a9e240ed061..016c50ef1cb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-out';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,32, "50,25", "0,255,0,32", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.html
index 8c2107dd660..6ba5e0cdbbf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-over';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,146,109,223, "50,25", "0,146,109,223", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.worker.js
index a78c609bc98..dda74f8166d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.destination-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-over';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,146,109,223, "50,25", "0,146,109,223", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.html
index 361547109b8..e06fe91b946 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'lighter';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,128,191,255, "50,25", "0,128,191,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.worker.js
index 0eb9cfb88a0..93eaf1c10db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.lighter.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'lighter';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,128,191,255, "50,25", "0,128,191,255", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.html
index 575b8602c78..7ce4bf52021 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-atop';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.worker.js
index 09fb6a36a08..6d4fd1ea22b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-atop';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.html
index 1b6f95b0b02..727f26f4029 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-in';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.worker.js
index 770ed073094..ecd8aa5dfbc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-in';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.html
index 093da537fd3..ed447d7f2d0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-out';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.worker.js
index 781d1cdc39a..243c8b35da8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-out';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.html
index 20718ca724d..bb4b2889eec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-over';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,36,219,223, "50,25", "0,36,219,223", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.worker.js
index 6c92de447a0..ba804b50bf6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.source-over.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-over';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,36,219,223, "50,25", "0,36,219,223", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.html
index 63202635954..76002336bf3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'xor';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.worker.js
index a489a98edaf..51f8eb2a5a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.transparent.xor.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'xor';
 ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html
index 6c16912f9b1..3418dfdf09f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js
index 67875330fdf..74bb34a19e4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html
index 464c6ee4a6c..4864995d3c8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js
index ac4d2a4cc3c..55e58c89a72 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html
index 02398436fb6..1cb6d26397e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js
index ec494169cfb..b961fd53946 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html
index 5f45113bf57..fd9ecc5c533 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js
index 37b810f2a18..f6caace54b9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html
index 0f5bb53183a..578a1a4bd5e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js
index 5d8f45248c2..6db1757d1b8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.translate(0, 25);
 ctx.fillRect(0, 50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html
index a4a095c546d..ae9196b7afd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js
index c6cedfeaef3..50f3c8256b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html
index 3148fad9907..a1d9c33c6ed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js
index 9f2717f8623..93bcd94c632 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html
index 5363cd5215b..2268f93885b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js
index 72169a005d4..7bf112ca944 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html
index 71650872b98..8f544237168 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js
index 2d500492125..600bc2f6159 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html
index 2b57b98c4c1..d15616d6bc4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js
index 76cd267ddd3..d027bf3c117 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
     _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.html
index 1abbe1efb7b..d24f6b4dba2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'copy';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.worker.js
index aee59d2572e..b5400201252 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'copy';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.html
index 46ce0c0ad0c..22a8bdda7d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-atop';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js
index 3443c1ada8f..b81303394fb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-atop';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.html
index edef4bc0f62..97af6731507 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'destination-in';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js
index fde33a5911a..aacd96f5581 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'destination-in';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.html
index 3239416ab4c..3904ad54aa0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-in';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.worker.js
index e591afc06fc..cb1070b37e5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-in';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.html
index c4e66c0ebef..70789f486fd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.globalCompositeOperation = 'source-out';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.worker.js
index ab4920dc213..726c3a80c49 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.nocontext.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of a canvas with no context draws pixels as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.globalCompositeOperation = 'source-out';
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html
index 62ad916d758..16d69485653 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js
index d42495e8177..5e2d6590fa4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html
index 364029d6a40..9f5b8e8751a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
index 76c2fcac8c4..7c4fb96a372 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html
index b9c4613fa0e..6c08dd1ae22 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
index 476f957fcbf..006268dcf64 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html
index fef35beb8a3..3cf0ac91c02 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js
index 522ce498264..1472e20a2d1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html
index 20846111371..7b8dd8ac358 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js
index be212173ee4..c9f71f23780 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
     ctx.fillRect(0, 50, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.html b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.html
index 96387e5a107..01b3ff9c65f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.html
@@ -11,6 +11,10 @@
 <p class="notes">This should not be upside down.
 <script>
 var t = async_test("Coordinate space goes from top-left to bottom-right");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,255,255, "25,12", "0,255,255,255");
 _assertPixel(offscreenCanvas, 75,12, 0,0,255,255, "75,12", "0,0,255,255");
 _assertPixel(offscreenCanvas, 25,37, 0,0,255,255, "25,37", "0,0,255,255");
 _assertPixel(offscreenCanvas, 75,37, 0,0,255,255, "75,37", "0,0,255,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.worker.js
index f4e30956f63..c39a6a4431e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.coordinatespace.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Coordinate space goes from top-left to bottom-right");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,255,255, "25,12", "0,255,255,255");
 _assertPixel(offscreenCanvas, 75,12, 0,0,255,255, "75,12", "0,0,255,255");
 _assertPixel(offscreenCanvas, 25,37, 0,0,255,255, "25,37", "0,0,255,255");
 _assertPixel(offscreenCanvas, 75,37, 0,0,255,255, "75,37", "0,0,255,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.html b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.html
index 67152573912..4c810495c8f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Missing arguments cause TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -112,7 +116,6 @@ if (ctx.putImageData) {
 var g = ctx.createLinearGradient(0, 0, 0, 0);
 assert_throws(new TypeError(), function() { g.addColorStop(); });
 assert_throws(new TypeError(), function() { g.addColorStop(0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js
index 755e881eb06..b8bc127b877 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Missing arguments cause TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -108,7 +112,6 @@ if (ctx.putImageData) {
 var g = ctx.createLinearGradient(0, 0, 0, 0);
 assert_throws(new TypeError(), function() { g.addColorStop(); });
 assert_throws(new TypeError(), function() { g.addColorStop(0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.html b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.html
index a90e637d4b2..bd1d5412f60 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("void methods return undefined");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -47,7 +51,6 @@ if (ctx.putImageData) {
 }
 _assertSame(ctx.drawImage(offscreenCanvas, 0, 0, 1, 1, 0, 0, 0, 0), undefined, "ctx.drawImage(offscreenCanvas, 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.worker.js
index d25b85d3fd3..6283f53ca95 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/conformance-requirements/2d.voidreturn.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("void methods return undefined");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -43,7 +47,6 @@ if (ctx.putImageData) {
 }
 _assertSame(ctx.drawImage(offscreenCanvas, 0, 0, 1, 1, 0, 0, 0, 0), undefined, "ctx.drawImage(offscreenCanvas, 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html
index 97eb5aa1719..44f33cf5e2f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -45,9 +49,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
index cb87cac359c..a600e2f28f2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,9 +44,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html
index c3f7d89112a..d82aa2d45d2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -46,9 +50,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
index b0e69668043..6fafc4e4f69 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,9 +45,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
index e4fe9b21ae6..44da5d5e5bb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
index 482d06e3668..697449f6dfe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
index 6d859458022..aad38fee72f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -47,9 +51,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
index 36141a07277..19f4bbcb306 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,9 +46,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
index 927a5fbef49..ce7f835bc8d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -47,9 +51,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
index 2d99434b9a1..3b85461f71f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,9 +46,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
index c6b9a1f8033..c18a47ff34f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
index 1020daa576c..8525ee99efa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
index 4efd2fc6fe3..4b43d5fb08e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,9 +45,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
index 0acde77b9cd..d73e3b952dd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html
index b4054619324..33b2502f65b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
index 1b3ebbe1831..5f29c1a1cca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,9 +31,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
index fdae65644df..16e9f791b2a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("drawImage() of an APNG draws the poster frame");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
index 17bf662321d..c3b566e844a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of an APNG draws the poster frame");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,9 +28,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html
index 9193e6db8af..a64d20e731e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     ctx.fillRect(0, 0, 100, 50);
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
index f3c847f4e7a..63163bd60aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,9 +30,7 @@ promise.then(function(response) {
     ctx.fillRect(0, 0, 100, 50);
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.html
index 81ba371e54f..2fc8293cb22 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
index 338d8de8992..3ff2dbecd7c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html
index b2f756c5ede..51651e56f39 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
index 026ed8de89c..90d0aad3ff8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html
index 09cc0637b0e..ba56e366f5a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
index 4b882ce36ca..09e3b3a00af 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,9 +31,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
index 64748731ad2..49a88fab035 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
index 0f95f510059..45398e83191 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,9 +28,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
index 6b5d6fa52c8..9466738bcf5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("Negative destination width/height represents the correct rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,9 +45,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
index 8ba67e3a466..284b4584067 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Negative destination width/height represents the correct rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
index fb4c3ae158b..4cbd37445c1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("Negative dimensions do not affect the direction of the image");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,9 +45,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
index 2647ada247c..00f0e7ec066 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Negative dimensions do not affect the direction of the image");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
index b5d719a31b4..66e9c212231 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("Negative source width/height represents the correct rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,9 +45,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
index 8d933484b5d..0f24542d928 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Negative source width/height represents the correct rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
index e98657092a9..9ca1a884b60 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("drawImage() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -331,9 +335,7 @@ ctx.drawImage(response, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity);
 ctx.drawImage(response, 0, 0, 100, 50, 0, Infinity, 100, Infinity);
 ctx.drawImage(response, 0, 0, 100, 50, 0, 0, Infinity, Infinity);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
index 1d2f114f0f7..f5d26785800 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -326,9 +330,7 @@ ctx.drawImage(response, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity);
 ctx.drawImage(response, 0, 0, 100, 50, 0, Infinity, 100, Infinity);
 ctx.drawImage(response, 0, 0, 100, 50, 0, 0, Infinity, Infinity);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
index 515d0de7a11..4d71c21bfb9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("Stretched images do not get pixels wrapping around the edges");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
index c31c1fa00f3..6f6b1e93a39 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Stretched images do not get pixels wrapping around the edges");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.html
index 8e7ad974d6e..0cf9ca26d73 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.html
@@ -12,13 +12,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.drawImage(null, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
index 51297ebc217..8ed0887ecd8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.drawImage(null, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html
index cf6594c62f8..47763cdb434 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     ctx.fill();
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
index 12c2ecfac0c..ba8302b5e1e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,9 +31,7 @@ promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     ctx.fill();
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.html
index e410e30cafd..de4a0f7eb59 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
index 171fededb81..5ad9048caaf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.html
index 55861656d89..b2e58db5715 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
index 5711bb7e4ba..c6fe0dcd2a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html
index bd8146d3f2c..ff83aa0330f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("drawImage() of an SVG image");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
index 7ff73bfb927..382190e6cd3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage() of an SVG image");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,9 +28,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html
index 2c1ca6bdf2b..2adcf021422 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
index 1ef01a88d3e..5e1095bc74e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,9 +31,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, 0);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
index 1a7dd432216..5cb283466bd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("Incorrect image types in drawImage do not match any defined overloads, so WebIDL throws a TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws(new TypeError(), function() { ctx.drawImage(undefined, 0, 0); });
 assert_throws(new TypeError(), function() { ctx.drawImage(0, 0, 0); });
 assert_throws(new TypeError(), function() { ctx.drawImage("", 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
index a8b170c3b44..ffdc2502163 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Incorrect image types in drawImage do not match any defined overloads, so WebIDL throws a TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws(new TypeError(), function() { ctx.drawImage(undefined, 0, 0); });
 assert_throws(new TypeError(), function() { ctx.drawImage(0, 0, 0); });
 assert_throws(new TypeError(), function() { ctx.drawImage("", 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
index 12bf837407f..f945cedab15 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ assert_throws("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2,
 offscreenCanvas2.width = 0;
 offscreenCanvas2.height = 0;
 assert_throws("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
index 8d18929a0d7..1e9d63cf92b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ assert_throws("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2,
 offscreenCanvas2.width = 0;
 offscreenCanvas2.height = 0;
 assert_throws("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
index 137d663aa32..645e2c9711f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 10, 10, 1, 0, 0, 0, 100, 50); });
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 10, 10, 0, 0, 0, 0, 100, 50); });
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
index 28ded3ad3b4..a38e98208b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
@@ -12,6 +12,10 @@
 
 <script>
 var t = async_test("drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 0, 0, 100, 50); });
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 0, 0, 100, 50); });
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
index 5c76d552165..304acdc1173 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ promise.then(function(response) {
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 0, 0, 100, 50); });
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 0, 0, 100, 50); });
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
index 90baefbe117..1e6f54f3882 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ promise.then(function(response) {
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 10, 10, 1, 0, 0, 0, 100, 50); });
     assert_throws("INDEX_SIZE_ERR", function() { ctx.drawImage(response, 10, 10, 0, 0, 0, 0, 100, 50); });
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
index e92ac62e80b..b7950681858 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect clears to transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js
index a456ebb0597..7871a039503 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect clears to transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
index 653d3918404..2c3ff0df91b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect is affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.clearRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js
index 7d03f40ebf0..456aaf46046 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect is affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.clearRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
index f5202c71559..9a289c9d6db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect is not affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.1;
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js
index 6593928b6c0..7feb19a9a3f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect is not affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.1;
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
index 803df81b739..7cb534c0ec9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect is not affected by globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalCompositeOperation = 'destination-atop';
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js
index efe5d2e4993..56c46d4b2aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect is not affected by globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalCompositeOperation = 'destination-atop';
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
index ff69557f976..55eef3d9b9a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect of negative sizes works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,0,0,0, "25,12", "0,0,0,0");
 _assertPixel(offscreenCanvas, 75,12, 0,0,0,0, "75,12", "0,0,0,0");
 _assertPixel(offscreenCanvas, 25,37, 0,0,0,0, "25,37", "0,0,0,0");
 _assertPixel(offscreenCanvas, 75,37, 0,0,0,0, "75,37", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js
index ee6ba9ec6d6..175634fc71a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect of negative sizes works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,0,0,0, "25,12", "0,0,0,0");
 _assertPixel(offscreenCanvas, 75,12, 0,0,0,0, "75,12", "0,0,0,0");
 _assertPixel(offscreenCanvas, 25,37, 0,0,0,0, "25,37", "0,0,0,0");
 _assertPixel(offscreenCanvas, 75,37, 0,0,0,0, "75,37", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
index ac94d019abb..1b236678a70 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,7 +46,6 @@ ctx.clearRect(0, Infinity, Infinity, Infinity);
 ctx.clearRect(0, Infinity, 100, Infinity);
 ctx.clearRect(0, 0, Infinity, Infinity);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js
index aae7f12d2bd..a68e54ffd1d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,7 +42,6 @@ ctx.clearRect(0, Infinity, Infinity, Infinity);
 ctx.clearRect(0, Infinity, 100, Infinity);
 ctx.clearRect(0, 0, Infinity, Infinity);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
index 0b32f318c6d..17f200a5d69 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.rect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 16, 16);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js
index 2716cf0e280..466169a5eb3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.rect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 16, 16);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
index 5361f4ebd17..a8bc47dbd39 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect does not draw shadows");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetX = 0;
 ctx.shadowOffsetY = 50;
 ctx.clearRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js
index 5b6c634f5ed..2f06e81af26 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect does not draw shadows");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetX = 0;
 ctx.shadowOffsetY = 50;
 ctx.clearRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
index fad0e223f87..a32a7b127e0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect is affected by transforms");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.scale(10, 10);
 ctx.translate(0, 5);
 ctx.clearRect(0, -5, 10, 5);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js
index 73370d1816b..6da0d2ab1ba 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect is affected by transforms");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.scale(10, 10);
 ctx.translate(0, 5);
 ctx.clearRect(0, -5, 10, 5);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
index ab0fe73c528..c068a7a6b5b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("clearRect of zero pixels has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.clearRect(0, 0, 100, 0);
 ctx.clearRect(0, 0, 0, 50);
 ctx.clearRect(0, 0, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js
index 0798b27118f..332cce2bf98 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("clearRect of zero pixels has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.clearRect(0, 0, 100, 0);
 ctx.clearRect(0, 0, 0, 50);
 ctx.clearRect(0, 0, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
index 12ae629451d..92aa877853f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js
index ae7cc6bb089..17eed3a873d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
index 22bbaab8ebf..a7a162e392f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect is affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js
index c2128b1d266..1125a7417e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect is affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
index e64eabc8038..433348716d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect of negative sizes works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js
index af040f18e1f..08de0e8fdc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect of negative sizes works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
index 13cfb518de3..4d72d88e0b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -43,7 +47,6 @@ ctx.fillRect(0, Infinity, Infinity, Infinity);
 ctx.fillRect(0, Infinity, 100, Infinity);
 ctx.fillRect(0, 0, Infinity, Infinity);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js
index d12689bc7ef..e7fb7f70ed5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -39,7 +43,6 @@ ctx.fillRect(0, Infinity, Infinity, Infinity);
 ctx.fillRect(0, Infinity, 100, Infinity);
 ctx.fillRect(0, 0, Infinity, Infinity);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
index 5f454b467ab..e4235dccfc4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillRect(0, 0, 16, 16);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js
index 9fb2852b574..1f0472eb898 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillRect(0, 0, 16, 16);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
index b9a643580ae..744b53581ca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect draws shadows");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetX = 0;
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js
index bd660b50717..f31a4166625 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect draws shadows");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetX = 0;
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
index 4ed1b28f62d..a4652b503dc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect is affected by transforms");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.translate(0, 5);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -5, 10, 5);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js
index a204b90f3f5..a61a5633917 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect is affected by transforms");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.translate(0, 5);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -5, 10, 5);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
index 8bd26d20560..8b69c5c2717 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect of zero pixels has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillRect(0, 0, 100, 0);
 ctx.fillRect(0, 0, 0, 50);
 ctx.fillRect(0, 0, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js
index bef6fdb6251..6a537d8d62b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect of zero pixels has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillRect(0, 0, 100, 0);
 ctx.fillRect(0, 0, 0, 50);
 ctx.fillRect(0, 0, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
index 3a8c38a2005..116cb2419d7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js
index 225788b081a..ea9613ae61b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
index 6ad1f1eeac0..1832d6d890a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect is affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.strokeRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js
index 33aad46741a..7b76210d7fc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect is affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.strokeRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
index 40cbbfcf550..563897f368f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect is affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js
index cb95672e38f..7c81bcc81aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect is affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
index dae7c9dcdb9..5d344e88573 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect is not affected by globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js
index 662f3dd6865..d6e64814e98 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect is not affected by globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
index a05ef50cf25..fc7240e8a0c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect of negative sizes works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js
index af12c4a0751..7cbccc4c01d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect of negative sizes works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
index db26a95e6e2..621d7b698be 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -44,7 +48,6 @@ ctx.strokeRect(0, Infinity, Infinity, Infinity);
 ctx.strokeRect(0, Infinity, 100, Infinity);
 ctx.strokeRect(0, 0, Infinity, Infinity);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js
index 3b622121fe2..bcd0deb2487 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,7 +44,6 @@ ctx.strokeRect(0, Infinity, Infinity, Infinity);
 ctx.strokeRect(0, Infinity, 100, Infinity);
 ctx.strokeRect(0, 0, Infinity, Infinity);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
index 79c3f79f2fa..87fbc44d88b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.strokeRect(0, 0, 16, 16);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js
index 3819965fa9a..8d5bbb059ad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.strokeRect(0, 0, 16, 16);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
index d02d046c462..c150f5fac1a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect draws shadows");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(0, -75, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js
index b63ff64cc41..9e91e974252 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect draws shadows");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(0, -75, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
index 875969ad034..2c90129b395 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillRect is affected by transforms");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 5;
 ctx.strokeRect(2.5, -2.6, 5, 0.2);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js
index 90b6f504044..89275e809ee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillRect is affected by transforms");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 5;
 ctx.strokeRect(2.5, -2.6, 5, 0.2);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
index 2c2cf39b149..12482af4c50 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect of 0x0 pixels draws nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 250;
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js
index 3f2af8c0ffa..ffedbe5bd36 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect of 0x0 pixels draws nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 250;
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
index cebabdb4f12..ef4388f0994 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect of 0x0 pixels draws nothing, including caps and joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineCap = 'round';
 ctx.lineJoin = 'round';
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js
index 9b5f26ed925..de6cfee74f6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect of 0x0 pixels draws nothing, including caps and joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.lineCap = 'round';
 ctx.lineJoin = 'round';
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
index 6063b14c6b6..80429284e99 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect of Nx0 pixels draws a straight line");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.strokeRect(0, 25, 100, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js
index aff8dabe7dc..c4ba24f1b04 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect of Nx0 pixels draws a straight line");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.strokeRect(0, 25, 100, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
index 5f169c6e957..860fe32dd7b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect of Nx0 pixels draws a closed line with no caps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.lineWidth = 250;
 ctx.lineCap = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js
index a38d6b8cd98..31f06613d1d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect of Nx0 pixels draws a closed line with no caps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.lineWidth = 250;
 ctx.lineCap = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
index 7588fad436e..5005367b1a4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeRect of Nx0 pixels draws a closed line with joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.lineWidth = 250;
 ctx.lineJoin = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js
index f2ed55227d8..155663bc1ca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeRect of Nx0 pixels draws a closed line with joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.lineWidth = 250;
 ctx.lineJoin = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html
index 51cc739b99c..adc4818b644 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.fillStyle, '#000000', "ctx.fillStyle", "'#000000'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js
index 35f59e21eef..99563f79eb8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.fillStyle, '#000000', "ctx.fillStyle", "'#000000'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html
index 56be1ecc1da..e394f855092 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.fillStyle = 'rgba(255,255,255,0.45)';
 assert_regexp_match(ctx.fillStyle, /^rgba\(255, 255, 255, 0\.4\d+\)$/);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js
index 40aacb1d428..7fa157d19c8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.fillStyle = 'rgba(255,255,255,0.45)';
 assert_regexp_match(ctx.fillStyle, /^rgba\(255, 255, 255, 0\.4\d+\)$/);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html
index 719ce0ca7f1..3cba3a4eb88 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.fillStyle = '#fa0';
 _assertSame(ctx.fillStyle, '#ffaa00', "ctx.fillStyle", "'#ffaa00'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js
index 157b41ed897..7fa7fd5ae9d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.fillStyle = '#fa0';
 _assertSame(ctx.fillStyle, '#ffaa00', "ctx.fillStyle", "'#ffaa00'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html
index 0796903fb5b..fd4c44573ed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.fillStyle = 'rgba(0,0,0,0)';
 _assertSame(ctx.fillStyle, 'rgba(0, 0, 0, 0)', "ctx.fillStyle", "'rgba(0, 0, 0, 0)'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js
index 0fc82203667..8bb175a0be7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.fillStyle = 'rgba(0,0,0,0)';
 _assertSame(ctx.fillStyle, 'rgba(0, 0, 0, 0)', "ctx.fillStyle", "'rgba(0, 0, 0, 0)'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.html
index 9c72f979b0b..cf2ca4c0579 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillStyle = 'invalid';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js
index 900d6e9371a..705f8ae6973 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillStyle = 'invalid';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.html
index b1551cdc194..73f6bbaf55b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillStyle = null;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js
index f097053ff66..a59868d4e19 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillStyle = null;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html
index 226bb5acfa7..ed844ec7de6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js
index 7709d10b04f..7d37516c963 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html
index 7c2b4b0399d..b37034b5239 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js
index b5cf874825f..e125c70440d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html
index 69f06197f65..2d429f0c8fb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js
index d4f33b58665..ae43a6376d7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html
index ae8dece63e4..4ac8acd7416 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js
index d96bf205d44..8ba1d33a3c1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html
index b520872d083..c673194caeb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js
index 7efed19208d..b38d84fab81 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html
index 3e4830e09ec..946a774fdf0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js
index a61a59ce262..99cfa25ee5e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html
index a4daa6498a7..ec939cfcf11 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js
index 404f1e4a68b..fbcbbc9969c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html
index 1f33e5e0c3b..52da8c9cb5d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js
index 916d62fc7f8..2e310de264d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html
index a470d18c891..d8cda7ffbbb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js
index b285e101d1b..fbfcbae3f5f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html
index bcc26eb4044..355ce88f5a2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js
index c6e7228718e..16cf1932f5f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html
index bb0ead608a4..b9131a93b46 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js
index df611d2adbf..5bbd618e079 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html
index ec9dce36e62..bf8bd1b5a8b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js
index 246e92edddd..90014c822ec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html
index c6e3fcc79fa..656eacf6acd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js
index 9e42ad50755..251d47ff598 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html
index 3b9c5f05278..77403cb2f1f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js
index 94fc24e9852..9222f4c5d6d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html
index 86bb08ad010..604d2e71c85 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js
index bc751f74647..bc1d30be55f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html
index f2a833be8dc..a36f3bb9b71 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js
index 22ffc899204..0e81a834d17 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html
index 84e8b3dcf99..3f5d15cd94b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js
index d5ff3714d40..a53f4ce678c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html
index bbb6555a0f7..85258773de9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js
index c81ddae395c..ffbc4b06555 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html
index e127bdb1390..cd88debf22a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255.0, 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js
index c09ba56ae15..b095f0e682a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255.0, 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html
index 37b1eb0454f..b6423fb0205 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255, 0, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js
index 8417215005e..74bbab38210 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255, 0, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html
index 46f8d95d4a2..30f13c28f68 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255, 0, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js
index 9b7cb351cc9..587a5f36cd0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255, 0, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html
index 9f7b0c9672a..cef04fd792b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0 255 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js
index bd2350a5412..c2b1c2a365e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0 255 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html
index 8dea6f6db2f..17f5591e773 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0 255 0 / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js
index 9cbb68a6495..723793643e3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0 255 0 / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html
index 518240f780d..46174d40adf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0 255 0 / 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js
index 526e2ab81e9..04c3e81b218 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0 255 0 / 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html
index 21081d86b2e..781ebd32705 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255.0, 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js
index 95feca8ef3b..3dead73dc2d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255.0, 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html
index 69a4ad542fa..be367a640ee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js
index 011ed04467a..fdfb1e287cc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html
index a489c3f1d04..a40c227d16f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js
index abd9cf1a8a9..a456e650df5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html
index 80f25d32cd5..093e34e098f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0 255 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js
index a6de83e44ce..4cda1ba3233 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0 255 0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html
index a54f88492c4..496e8b861db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0 255 0 / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js
index a069b41fbd0..bf9b76bfce0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0 255 0 / 0.2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html
index afbe418f9f7..8306b836b08 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0 255 0 / 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js
index 66df2f9334f..0e20e849da6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0 255 0 / 20%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html
index 65307cd3385..ccc729a043f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js
index 5ca4fe716c5..312e0402ee5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
index 6546bdd0658..07a563addda 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#0f0f';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js
index 2a6c368cb9a..93b59bb0a41 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#0f0f';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html
index fa205427530..4494782bc26 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#00fF00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js
index abf4d9fce49..3b373ee95a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#00fF00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
index b5741203352..525f207727e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#00ff00ff';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js
index aef17eeb964..b71f1512c3f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = '#00ff00ff';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html
index 22d2879741f..80210a47062 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js
index 49228a85931..37e719d4b89 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html
index 22fd3291ae0..3600ff6db22 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl( -240 , 100% , 50% )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js
index 956dccc7c1f..2f5b4e91b03 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl( -240 , 100% , 50% )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html
index 3e919ae605e..5ebe2ea71e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(360120, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js
index 29be2d1732d..f401f38dd18 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(360120, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html
index 8ea7e07896a..f28cf49d096 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(-360240, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js
index 44be41e48ea..86115a888c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(-360240, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html
index 429c0e6e975..8779bf954e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js
index 625579cb7ae..216de5753c3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html
index 62b004bf99f..a4a3e79c4c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(+120, +100%, +50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js
index 1650f4edc0e..7a7d34d73b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(+120, +100%, +50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html
index e68ba60acb9..23362f9b0ba 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 200%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js
index 6e638a7e5e6..2db04585a4f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 200%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html
index 0c1f5321491..539a9c10e85 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, -200%, 49.9%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js
index c4851d64ecf..e817e05f261 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, -200%, 49.9%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html
index 3cbbad8fc9c..89a6e8d015a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 100%, 200%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js
index f5e90c2e936..ed3e6f76ca1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 100%, 200%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html
index 735f6a0b8cb..a5c4e2197f9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 100%, -200%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js
index 583ac2549bc..a6d1ebc7803 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsl(120, 100%, -200%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html
index 65091f5b929..6bafa6bb430 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js
index 46a98b1cce5..f01708db9c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html
index f433c9d8f32..28e3d6e9a36 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla( 120.0 , 100.0% , 50.0% , 1 )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js
index 135d692c400..ebb3b2506f5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla( 120.0 , 100.0% , 50.0% , 1 )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html
index 9ca76c5ecc8..2c7f7a12b15 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 200%, 50%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js
index 152fa384aff..9ad667cd030 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 200%, 50%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html
index bc423c2d91a..5f13ac447cf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js
index 1fb26cf5c4a..e266c44581c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html
index 659c8e01200..b91ffd7fde4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 200%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js
index fd4ac960389..d3c39f115dd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 200%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html
index bfda01c121b..2d66402f521 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, -200%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js
index 730acae40d3..febaa5f4174 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, -200%, 1)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html
index 7d3ebb874e1..fd2ee45e9be 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 50%, 2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js
index 1a401aa7f86..9447c0aac06 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 50%, 2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html
index e63732896e8..789c82efb65 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 0%, -2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js
index c6832d98ce3..27652a81aa6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'hsla(120, 100%, 0%, -2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.html
index d76252cdae1..9e4c4d9ef38 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'limE';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js
index ac9b6e162d5..a83234f7d03 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'limE';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html
index 428d440d851..e5a77029109 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js
index 0f0132752ba..8a284be783c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html
index ac2fd719c28..f270720ccd4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js
index 4355567229e..1378a4a2a82 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html
index 85e835de461..7bd8394b6cf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js
index d274b8628f4..f1196f4b064 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html
index 7a73e5c2292..01cc8bfaeee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0 100% 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js
index d57b1961ad2..caeb9ec4d40 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0 100% 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html
index 6d1fecd4e3d..e56ad677f41 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js
index ea043e51e01..ec0a3eb8080 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html
index 9d8110048c4..42d652c762f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js
index c2c9ea051e4..f254388e888 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html
index 47f1a229c0e..7c9f31275c9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js
index 3d975770643..1c5e0813d10 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html
index c9a1d497154..d7dcfdcf954 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js
index 9a6c49f2eee..b0ad12f9b57 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html
index 104f8806db6..beeb1366d57 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js
index 2899f40c6d5..c1aa4f2598d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html
index 2d96d02245e..fdd30caf9e9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js
index ff388b974ce..dbf5d19a5d8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html
index 0ab6881a440..d239397fdb7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js
index 108e36d4bdf..dc01bc78f1b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html
index 1093a5c68eb..1f52ea33d0f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(0 0 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js
index 8ff720eacc3..91423b1c2e4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(0 0 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html
index 923e8ba4d27..61ffaafefcb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(0, 0, 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js
index 8607b34b217..c4568304199 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(0, 0, 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html
index cc6a80adbdc..8a448e2343f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js
index 6ffe0bdd01e..daf541d407e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html
index 181e7ba8766..eefa1774c0b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js
index 1a6600e436f..54e53c07c2d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html
index e190de146a5..fdd9d46ac5c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js
index b691fb55a5f..24b43f19c4d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html
index ceb0af4d3d8..eec4b9ebb5f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js
index c7c3058986f..74bd3968f4e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html
index f8e00c7b541..ae0f705fa20 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#f0'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js
index 9256e7ee488..e2e5cb227bb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#f0'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html
index 40cd7fdef09..63feee6b7ec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#g00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js
index 5bbfe6510c5..6d987f785e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#g00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
index cd896a258a9..264c4c5adc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#fg00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js
index a3f98172c84..cafe61aede7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#fg00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html
index 4e340b690b3..3c7d58e7b9a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#ff000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js
index d1de7c52239..573137379bb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#ff000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html
index 842739aff01..e7c0d26ddde 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#fg0000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js
index 13674bf27df..3fd5ec44105 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#fg0000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html
index 3368ef2ef8d..7dd3312ebb4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#ff0000f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js
index 9346d014df3..a8c23e02f01 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#ff0000f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
index 4c68eb1128c..b2460045cdf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#fg0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js
index 88232771e19..3d3dfc135b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '#fg0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html
index 9e2a2ff8cf0..b54d23efff5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js
index 64ca3fb3f1e..ee30d326d19 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html
index 87b1c49492d..88468d9b5b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js
index 8f2688972a6..5c6be3417f8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html
index c17d8b36ea6..8ffb63f43bc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js
index 3c3a5398621..ac73b529de3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html
index 5b49863ae6d..38740899482 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js
index 13a7f67b28f..f4239ecde07 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html
index e7b19bda497..c35a2c4eb7c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100.%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js
index faafa6ca298..093fc7896a3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100.%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html
index 058f777aec5..879e1b8e17e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 50%,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js
index 6ef178fe9d5..d2252c22174 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsl(0, 100%, 50%,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html
index 073bd73565b..34cb3e35b34 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js
index 9f8c1059512..a0a7b1ef693 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html
index 0a3a777d725..6e0fbea5a94 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js
index f873d14c42b..ced583be320 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html
index f35b50f997d..b524aec49a4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 0, 50%, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js
index 85b9415cf69..c08da34ad9c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'hsla(0, 0, 50%, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html
index a49efb342de..a727898664a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'darkbrown'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js
index 2e99264ff95..268176fdfec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'darkbrown'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html
index 31c3b3b218a..8b99181c13b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'firebrick1'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js
index d479378e1b4..2982e573bcc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'firebrick1'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html
index 7d6d4cc7c41..7feac02bef0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'red blue'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js
index 6c43ce61ecf..56a003fe009 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'red blue'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html
index 3fa81d55b15..9137789fa77 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '"red"'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js
index 2c5a99680bc..fd198ba7a9a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '"red"'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html
index 196b1540bdf..d450975150f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '"red'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js
index 0374288d3df..940e50bdf52 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = '"red'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html
index 61f61e1f9e5..2b16c0c4816 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js
index 2b6b77fb77b..915b3132b11 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html
index 888cd24d925..7f3bd260ff1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(100%, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js
index 77793f21d5b..940f55516e4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(100%, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html
index 6f23cd3d537..e6cb301d2d8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js
index 0f384fff940..1374dc0ffef 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html
index b5b35153cf0..3347fde5048 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(100%, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js
index 88343536912..c7bd7dcd681 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(100%, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html
index a406acee58c..16d385e54f8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, 1. 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js
index 07817293017..eadeecc7bde 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, 1. 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html
index b7bcd456e52..eb4be0d289a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, 1.)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js
index 20aa6549321..053738e0b50 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, 1.)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html
index 638159ffb32..a7a3697d746 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, '; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js
index d99ab57b524..60769e71705 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, '; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html
index 3599f0a58e3..e84fb5b59b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js
index 2b81e8ee14e..fccab52fb6e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#0f0';
 try { ctx.fillStyle = 'rgba(255, 0, 0, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html
index 9df6a9b4014..1b2a3b22569 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html
@@ -11,6 +11,10 @@
 <p class="notes">Assumes colours are clamped to [0,255].
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-1000, 1000, -1000)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js
index 2bfd49319da..97abbc96c19 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-1000, 1000, -1000)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html
index 7e8864cef4c..471b67b13d3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html
@@ -11,6 +11,10 @@
 <p class="notes">Assumes colours are clamped to [0,255].
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-200%, 200%, -200%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js
index d2b25f5e574..86c1f29dd65 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-200%, 200%, -200%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html
index 9205923db6e..8f659f78ff5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html
@@ -11,6 +11,10 @@
 <p class="notes">Assumes colours are clamped to [0,255].
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js
index 50b9eca10c1..2afc6bb7da0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html
index 7b79a5a6df2..aa0e9a5a156 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html
@@ -11,6 +11,10 @@
 <p class="notes">Assumes colours are clamped to [0,255].
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js
index 4c6bc4b2c51..d3c97949f1b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html
index 4f1e0804f7f..c40972ce442 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html
@@ -11,6 +11,10 @@
 <p class="notes">Assumes colours are clamped to [0,255].
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js
index 1c32ae4f070..f25a2cada6e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html
index 7684a185d5c..52a7883323e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255, 0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js
index d82c64faa7a..d979eec3da2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0, 255, 0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html
index 256992b6432..f04ae7c1fa1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0,255,0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js
index b7f79a2d454..5913a7c83d7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0,255,0)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html
index c5032d4e2e1..d21b9065095 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html
@@ -11,6 +11,10 @@
 <p class="notes">CSS3 Color says "The integer value 255 corresponds to 100%". (In particular, it is not 254...)
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0% ,100% ,0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js
index f3ff4ec5e96..c1d14b5a27f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgb(0% ,100% ,0%)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html
index 592f798aafb..15b2e49d302 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, -2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js
index 06df1feea17..ac1150c8099 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, -2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html
index 433559e3b83..daf6aa3a832 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js
index 7fbe239f137..2398f0aebe0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 2)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html
index 6785eeb9c11..bc4060aafc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 1';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js
index b35e61e8231..415a06d4445 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0, 255, 0, 1';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html
index 06e7676cc06..ce93cdd6ade 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  .499  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js
index c764baadc60..78335b625a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  .499  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html
index c30605d1f4e..25cc2ba560e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  0.499  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js
index a100ab7782d..4caeb027c0a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  0.499  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html
index 74fa502c7d6..8effe1e000c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0%,100%,0%,0.499)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js
index ff97e305b91..d5047e934b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(0%,100%,0%,0.499)';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html
index 1894270290b..d8caaf973fb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js
index 1330db9e2c0..0b45ee7f51d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html
index fb7e6212bc9..12116cd30c6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1.0  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js
index 58e7f4c7df5..8bdbfc7ed71 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1.0  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html
index 81825a3d6d3..0965fecb280 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  , +1  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js
index dfda77763c8..862b76421f2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba(  0  ,  255  ,  0  , +1  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html
index a300e3a3779..d120398cc22 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba( -0  ,  255  , +0  ,  1  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js
index 3d2fa4c4b5f..88c11753606 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'rgba( -0  ,  255  , +0  ,  1  )';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html
index e9d8a1c139a..4b34a982cc5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'gray';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js
index 47a95b92a17..caa5274ca8a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'gray';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html
index 04742747f72..893ddf85c73 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'grey';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js
index e60b819557c..4576c9023ec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'grey';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.html
index 16cc536ee5e..2ec3e23df0b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.fillStyle = '#f00';
 ctx.fillStyle = 'ThreeDDarkShadow';
 assert_regexp_match(ctx.fillStyle, /^#(?!(FF0000|ff0000|f00)$)/); // test that it's not red
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js
index 2d6e6bd54d7..a9fa811c7d2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.fillStyle = '#f00';
 ctx.fillStyle = 'ThreeDDarkShadow';
 assert_regexp_match(ctx.fillStyle, /^#(?!(FF0000|ff0000|f00)$)/); // test that it's not red
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html
index 7b12e22552f..3db8189b8a7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'transparent';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js
index 6f50f04331c..b41cf0df6c7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'transparent';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html
index 8b857b9ae1b..45ee2e1505f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html
@@ -11,6 +11,10 @@
 <p class="notes">
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'TrAnSpArEnT';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js
index d0e6e3f72bf..b96bd0b1868 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'TrAnSpArEnT';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.html
index f6d79eabdde..6d7049ac842 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ var g = ctx.createLinearGradient(0, 0, 0, 50);
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.worker.js
index 890171cfa18..85eb31105a2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var g = ctx.createLinearGradient(0, 0, 0, 50);
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html
index f5af8605499..34b74f5e27f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
 _assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js
index 32d429fd69b..6d7039208ce 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
 _assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.html
index 7cb6d0e059a..742718f0242 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
 _assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js
index 67009980583..4dc0b11a4e7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
 _assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html
index e091155c7d9..3fbd3adadb3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 25,25, 190,190,65,65, "25,25", "190,190,65,65", 3);
 _assertPixelApprox(offscreenCanvas, 50,25, 126,126,128,128, "50,25", "126,126,128,128", 3);
 _assertPixelApprox(offscreenCanvas, 75,25, 62,62,192,192, "75,25", "62,62,192,192", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js
index 0bd86f7c1ac..449cfdfd5db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 25,25, 190,190,65,65, "25,25", "190,190,65,65", 3);
 _assertPixelApprox(offscreenCanvas, 50,25, 126,126,128,128, "50,25", "126,126,128,128", 3);
 _assertPixelApprox(offscreenCanvas, 75,25, 62,62,192,192, "75,25", "62,62,192,192", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html
index 2056b87bd28..86cb98a0f74 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 200, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3);
 _assertPixelApprox(offscreenCanvas, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3);
 _assertPixelApprox(offscreenCanvas, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js
index e7a08578619..98ee46734fc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 200, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3);
 _assertPixelApprox(offscreenCanvas, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3);
 _assertPixelApprox(offscreenCanvas, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.html
index cc1aaeff0c8..6327d403037 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js
index 564ca3c5ed9..d5619173dca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html
index aa4da5160de..cb68a6ce19b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,7 +46,6 @@ _assertPixelApprox(offscreenCanvas, 99,25, 0,0,255,255, "99,25", "0,0,255,255",
 _assertPixelApprox(offscreenCanvas, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16);
 _assertPixelApprox(offscreenCanvas, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16);
 _assertPixelApprox(offscreenCanvas, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js
index 4435de765c7..0c1bf2c08af 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,7 +42,6 @@ _assertPixelApprox(offscreenCanvas, 99,25, 0,0,255,255, "99,25", "0,0,255,255",
 _assertPixelApprox(offscreenCanvas, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16);
 _assertPixelApprox(offscreenCanvas, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16);
 _assertPixelApprox(offscreenCanvas, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html
index 7151fcd180b..a8ab738b419 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 30,25, 0,255,0,255, "30,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 40,25, 0,255,0,255, "40,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 60,25, 0,255,0,255, "60,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js
index 2463b26b584..c0c36435e28 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 30,25, 0,255,0,255, "30,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 40,25, 0,255,0,255, "40,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 60,25, 0,255,0,255, "60,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.html
index 1c1bd39d0f4..b1fba4092a5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js
index de746abf80a..4a12289f2c7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html
index 7415e78f510..a3eea4775e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5);
 _assertPixelApprox(offscreenCanvas, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js
index 01f9a1133bf..1c1624d6c24 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5);
 _assertPixelApprox(offscreenCanvas, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html
index fc2ab8f8dd9..cc61b50e48b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillStyle = g;
 ctx.rect(0, 0, 100, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js
index 2f65344471a..f3242c21314 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = g;
 ctx.rect(0, 0, 100, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html
index 162b22e9d80..3033c94e25c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ g.addColorStop(1, '#f00');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js
index 621317791e9..50e86005714 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ g.addColorStop(1, '#f00');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html
index 5283eb6ff32..ecc610dd4b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255");
 _assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js
index 269ec5bacdb..4624052020d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255");
 _assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html
index e5d04f5586b..c6a421add3a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255");
 _assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js
index bd4e780c99d..dca239c9bbd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255");
 _assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255");
 _assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html
index 162dc606c3a..51d48ac0fe1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createLinearGradient() 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -39,7 +43,6 @@ assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, Infinity
 assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, Infinity, Infinity, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, Infinity, 1, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, 0, Infinity, Infinity); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js
index 248043deea5..c8268b00993 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createLinearGradient() 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,7 +39,6 @@ assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, Infinity
 assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, Infinity, Infinity, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, Infinity, 1, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createLinearGradient(0, 0, Infinity, Infinity); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.html
index 350d08c9a2a..797802ce89d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Linear gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.fillRect(50, 0, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js
index 7154253b6e6..ada0b968976 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Linear gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillRect(50, 0, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.html
index c1c42497bb2..80b87919efd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Linear gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.fillRect(50, 0, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js
index 016dc6d6037..33058249520 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Linear gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(50, 0, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.html
index 1938cf4f961..c730bd5a897 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Linear gradient transforms do not experience broken caching effects");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.fillRect(50, 0, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js
index 69a97f97ae7..5455f24b77b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Linear gradient transforms do not experience broken caching effects");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(50, 0, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html
index ba4df237779..3020c60a683 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ var g2 = ctx.createLinearGradient(0, 0, 100, 0);
 _assertDifferent(g1, g2, "g1", "g2");
 ctx.fillStyle = g1;
 _assertSame(ctx.fillStyle, g1, "ctx.fillStyle", "g1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js
index 937e1890c51..f908cc6808e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ var g2 = ctx.createLinearGradient(0, 0, 100, 0);
 _assertDifferent(g1, g2, "g1", "g2");
 ctx.fillStyle = g1;
 _assertSame(ctx.fillStyle, g1, "ctx.fillStyle", "g1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html
index 9a2fe69006a..e7c22e36293 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js
index e111aa99644..b4f284f7c70 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html
index 63990930bbd..0b72a83527f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, 'null'); });
 assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, 'undefined'); });
 assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, null); });
 assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, undefined); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js
index 2483e3f8674..526edbffb60 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, 'null'); });
 assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, 'undefined'); });
 assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, null); });
 assert_throws("SYNTAX_ERR", function() { g.addColorStop(0, undefined); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html
index 813c46cf43c..d841895c97e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ assert_throws("INDEX_SIZE_ERR", function() { g.addColorStop(2, '#000'); });
 assert_throws(new TypeError(), function() { g.addColorStop(Infinity, '#000'); });
 assert_throws(new TypeError(), function() { g.addColorStop(-Infinity, '#000'); });
 assert_throws(new TypeError(), function() { g.addColorStop(NaN, '#000'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js
index 366cd79346b..23b5d7a3d85 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ assert_throws("INDEX_SIZE_ERR", function() { g.addColorStop(2, '#000'); });
 assert_throws(new TypeError(), function() { g.addColorStop(Infinity, '#000'); });
 assert_throws(new TypeError(), function() { g.addColorStop(-Infinity, '#000'); });
 assert_throws(new TypeError(), function() { g.addColorStop(NaN, '#000'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.html
index 21835db43b1..66fa6122af3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ g.addColorStop(0.1, '#0f0');
 g.addColorStop(0.9, '#0f0');
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.worker.js
index 61439fbecf5..f6c1531d212 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.update.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ g.addColorStop(0.1, '#0f0');
 g.addColorStop(0.9, '#0f0');
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
index c6f7e4ae851..45292dd6fe1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
index ebd4517fc9d..9e20c3b42e7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
index 57de6fca70e..e1996ad8f7b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
index 5aeb58fbe80..2bb87921992 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
index e7e1957ac20..a4cac095211 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
index 9290614e9f0..9135f2869d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
index 70a4dd0c4ca..234c8f2482d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
index 340b87cc737..07866fe48db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
index fd6f2d66b2e..5ac1de86a64 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
index 30addca9533..4eaee47f70d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
index 84c95801f37..816156628b2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -39,7 +43,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
index 7e5feae6827..1616833ebb9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,7 +39,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
index 45695ebc7d9..07acaa86eb2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -39,7 +43,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
index 90734bccd8d..c6f921737ff 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,7 +39,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
index f6dfa64b6c5..3f80ca99d98 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
index 6221b4fc8ff..5146441968e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.html
index 9ca390af876..4a83b26c34b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
index d3113570dcd..385374c093c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.html
index ea27c0df944..3682bba0f09 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
index c7eccfdbaf2..2fe1656ccd4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.html
index 16d3c965999..02d3ab1af61 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
index 8f2d10087ee..5f6e185a249 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.html
index ea5863e5425..5abaddf168c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
index ae236d34abf..96313cfea0c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html
index 70b5d19bf12..39cacb901e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, -0.1, 0, 0, 1); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, -0.1, 0, 0, -0.1); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js
index 7a662468be3..979e020796b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, -0.1, 0, 0, 1); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, -0.1, 0, 0, -0.1); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html
index 026a4ebfbf5..ce657dec4c2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createRadialGradient() 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -91,7 +95,6 @@ assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, In
 assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, Infinity, 0, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, 0, Infinity, Infinity); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js
index 09458c628da..6a2d6e0eb04 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createRadialGradient() 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -87,7 +91,6 @@ assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, In
 assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, Infinity, 0, Infinity); });
 assert_throws(new TypeError(), function() { ctx.createRadialGradient(0, 0, 1, 0, Infinity, Infinity); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.html
index c1b8a784bda..295b985a720 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
index 658438fd0db..4589b0c52e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.html
index 086bce9af93..363618361b3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
index 11d7cdd5d58..90f9e66553f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.html
index 0884d5e2c3d..0b25145518d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
index 2bc5d12117a..401d46f7a15 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.html
index 7af332cb22a..e0919975da9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
index 97326018fb6..c55f61a5aee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.html
index 3fea8066889..546f35433a0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
index b45aa46ac02..870f8c4ccc3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.html
index 86caf07ae83..943b44416f0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
index 92e7f6f1e13..0c4ee83e28a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.html
index d0bf2dfb898..e946b89d917 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Radial gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.fillRect(-5, -2.5, 10, 5);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js
index 5bed45d5365..1c6320a5e00 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Radial gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(-5, -2.5, 10, 5);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.html
index 174d248c170..c1cd3e00900 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Radial gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.fillRect(-5, -2.5, 10, 5);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js
index 83ac31c83bd..99da8745227 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Radial gradient coordinates are relative to the coordinate space at the time of filling");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillRect(-5, -2.5, 10, 5);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.html
index 54677993923..348b8b60674 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Radial gradient transforms do not experience broken caching effects");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.fillRect(-5, -2.5, 10, 5);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js
index 65446044bd9..4a8fb0e01c6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Radial gradient transforms do not experience broken caching effects");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillRect(-5, -2.5, 10, 5);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.html
index b0a4e67077d..91ee26442f9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js
index 86d0a05e5a6..b8366536ae5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html
index 4dd6fb47018..1e0585ec104 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js
index fe6af5ded07..adf6b7d5802 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.html
index efe2345a059..075470f0a01 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js
index d35d186fef9..31add065ac2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html
index 9a91555e36f..2293d21bf7b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ offscreenCanvas.height = 0;
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
 assert_throws("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js
index bd8b9b8dc5a..c015002c6ad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ offscreenCanvas.height = 0;
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
 assert_throws("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html
index bcf987ffd5f..d3c8cd636b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.fillStyle = pattern;
     ctx.fillRect(0, 0, 100, 50);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js
index 56f5d3de968..f660f213d6a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.fillStyle = pattern;
     ctx.fillRect(0, 0, 100, 50);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.html
index 220962579e3..193bb9dd4c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createPattern(null, 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.worker.js
index a3186103315..6b5ad64c7c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.null.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createPattern(null, 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.html
index 17a39e55ab3..0722f8f2817 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createPattern('../images/red.png', 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.worker.js
index a90aed85b73..c64f978c3fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.string.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createPattern('../images/red.png', 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.html
index 5fbae270431..8dff9482813 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createPattern(undefined, 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js
index edd855997a3..52163c091c5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createPattern(undefined, 'repeat'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.html
index 52a3f25c20e..632c5aefc8b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js
index 81d8635e65e..841a9802c1b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.html
index 6311a22d58f..f1f268551be 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js
index b7aa138d0c3..31d7462aaa4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html
index 7fbac727957..ea5adcc8fe4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js
index 318278b5ba5..042f0c61a71 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html
index 764ffb8f891..8fcab2b0c9a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,9 +42,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js
index c43d90c57b6..fae7427b58d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html
index ed66d9dce1f..191f0bde3e1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,9 +42,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js
index 5246a21a13d..5c6c5c1c21e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html
index 64fba24e2d8..966fac84123 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,9 +42,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js
index ab2d34dc3a4..8cc326b733a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html
index b118ae25754..7fbee4db8ba 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,9 +44,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js
index ee4e62d7074..85594b6370e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html
index 66d01057847..8ff07ad8e91 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Canvas patterns do not get flipped when painted");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js
index bb51634b9c3..d017f08306f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Canvas patterns do not get flipped when painted");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html
index 326e6ae25df..02ffc97632e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Image patterns do not get flipped when painted");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,9 +44,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js
index 62ec6d050c3..e365dd6bbec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Image patterns do not get flipped when painted");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html
index 13cb9d0ced6..8149d8938ea 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js
index 4ccd01125f3..d6bad4c2240 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html
index 15c9d0ef934..63d30dba51e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js
index ab1e2f1eabf..b31ebcb6656 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html
index 7cbecfb8c88..404a51d727b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js
index c6c9adec776..3ab6b4068af 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html
index e8e61d904a5..70028f7b9fb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js
index c5049b8183b..3ae9dc9a7aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html
index a2898cd27a6..7af8e2dfe19 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js
index 65d898b6818..3db708229dd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html
index e414aa6dcc1..45e36a403ca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -37,9 +41,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js
index 19b9c27f4f1..209427ea824 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html
index fd94c1fa7f8..7818db33ec3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,9 +44,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js
index eb63bc1439f..080887b1051 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html
index ffeccd25648..f2fcaac9cbf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -37,9 +41,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js
index af445ade40e..6c43646e1e9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html
index b0dc7df7c59..813f7f3a581 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -37,9 +41,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js
index d1f8b5fa0d6..d9f53a00eb4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html
index a4f58fb71d9..6102405784f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,9 +44,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js
index 359d079c043..92c39e2f967 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,9 +40,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html
index fd8c2be188f..67c4061c753 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -37,9 +41,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js
index 7f73ae25e48..dd6d243ba5a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.html
index 59763aa39ea..392dfb66e91 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "Repeat"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js
index 44838d970c0..1f7557e483f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "Repeat"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html
index 657221124e2..426c069a446 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,9 +39,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js
index 7a387f2a0b7..5338663f9f5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,9 +35,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
     _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
     _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.html
index e36a278a308..246dc0a4eab 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assert(ctx.createPattern(offscreenCanvas, null) != null, "ctx.createPattern(offscreenCanvas, null) != null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js
index 9c96eaee202..5c65bfb39f1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assert(ctx.createPattern(offscreenCanvas, null) != null, "ctx.createPattern(offscreenCanvas, null) != null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html
index 6d5db664c77..4b0f25afbf9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "repeat\0"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js
index 18953ea1118..3288e128257 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "repeat\0"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.html
index 656f93ff055..0722ae5ddc9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, undefined); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js
index 3cd4d8dcb50..020adf7c002 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, undefined); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html
index ac3a258641b..03f4659fd77 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "invalid"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js
index 1481c839f0a..2d7796d0ae3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "invalid"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html
index 3004efe1ca0..5d5b70536c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "null"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js
index c55c6212f5f..d16979b6e98 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "null"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html
index 1c350ba3810..a05008ed851 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.strokeStyle, '#000000', "ctx.strokeStyle", "'#000000'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js
index 803c7002dc8..399e9dda70a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.strokeStyle, '#000000', "ctx.strokeStyle", "'#000000'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.html
index eb85e108b4c..fc108c0de49 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineCap 'butt' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -46,7 +50,6 @@ _assertPixel(offscreenCanvas, 75,16, 0,255,0,255, "75,16", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,34, 0,255,0,255, "75,34", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,36, 0,255,0,255, "75,36", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.worker.js
index 82bf9abaaa8..13020adb087 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.butt.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineCap 'butt' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,7 +46,6 @@ _assertPixel(offscreenCanvas, 75,16, 0,255,0,255, "75,16", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,34, 0,255,0,255, "75,34", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,36, 0,255,0,255, "75,36", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.html
index 4124a7e7034..67fc358b043 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Line caps are not drawn at the corners of an unclosed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.worker.js
index 358aacdc499..b4cfe501808 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.closed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Line caps are not drawn at the corners of an unclosed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.html
index 5ccad43d42e..b8499fca056 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting lineCap to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,7 +40,6 @@ _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
 ctx.lineCap = 'butt';
 ctx.lineCap = 'bevel';
 _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js
index 274ef707f88..46046d41611 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting lineCap to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
 ctx.lineCap = 'butt';
 ctx.lineCap = 'bevel';
 _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.html
index fdd7c6920a8..154aaf75207 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Line caps are drawn at the corners of an unclosed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.worker.js
index 19a4375b4d6..e671b55d06d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.open.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Line caps are drawn at the corners of an unclosed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.html
index 97ac28e50a7..5fc90198e88 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineCap 'round' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -55,7 +59,6 @@ _assertPixel(offscreenCanvas, 82,6, 0,255,0,255, "82,6", "0,255,0,255");
 _assertPixel(offscreenCanvas, 67,43, 0,255,0,255, "67,43", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,43, 0,255,0,255, "75,43", "0,255,0,255");
 _assertPixel(offscreenCanvas, 82,43, 0,255,0,255, "82,43", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.worker.js
index dda047cf44c..38faae623fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.round.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineCap 'round' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -51,7 +55,6 @@ _assertPixel(offscreenCanvas, 82,6, 0,255,0,255, "82,6", "0,255,0,255");
 _assertPixel(offscreenCanvas, 67,43, 0,255,0,255, "67,43", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,43, 0,255,0,255, "75,43", "0,255,0,255");
 _assertPixel(offscreenCanvas, 82,43, 0,255,0,255, "82,43", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.html
index 6b3b28194a1..8cd09c683fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineCap 'square' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -46,7 +50,6 @@ _assertPixel(offscreenCanvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,44, 0,255,0,255, "75,44", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,45, 0,255,0,255, "75,45", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,46, 0,255,0,255, "75,46", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.worker.js
index 65031f95746..aeac1e3c04f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.square.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineCap 'square' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,7 +46,6 @@ _assertPixel(offscreenCanvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,44, 0,255,0,255, "75,44", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,45, 0,255,0,255, "75,45", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,46, 0,255,0,255, "75,46", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.html
index 9e56b36816f..9d4548767ae 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting lineCap to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineCap = 'round';
 _assertSame(ctx.lineCap, 'round', "ctx.lineCap", "'round'");
 ctx.lineCap = 'square';
 _assertSame(ctx.lineCap, 'square', "ctx.lineCap", "'square'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.worker.js
index 3fb104378d6..da84eb91dfe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cap.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting lineCap to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.lineCap = 'round';
 _assertSame(ctx.lineCap, 'round', "ctx.lineCap", "'round'");
 ctx.lineCap = 'square';
 _assertSame(ctx.lineCap, 'square', "ctx.lineCap", "'square'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.html
index 264f309e849..747787c7ba3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.worker.js
index 599edc45915..2c8e68bfbd1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.cross.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.html
index 6eaebbcc05d..1051d99609d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.worker.js
index ce8f4bb73ca..e904d39112d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.defaults.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.html
index ebb24aeba14..0e4dd13bf4d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineJoin 'bevel' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -59,7 +63,6 @@ _assertPixel(offscreenCanvas, 84,15, 0,255,0,255, "84,15", "0,255,0,255");
 _assertPixel(offscreenCanvas, 85,15, 0,255,0,255, "85,15", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,15, 0,255,0,255, "86,15", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.worker.js
index ee1e7f3eae2..d68b4911ac5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.bevel.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineJoin 'bevel' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -55,7 +59,6 @@ _assertPixel(offscreenCanvas, 84,15, 0,255,0,255, "84,15", "0,255,0,255");
 _assertPixel(offscreenCanvas, 85,15, 0,255,0,255, "85,15", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,15, 0,255,0,255, "86,15", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.html
index 9c79d92ec26..ba92b4c53fe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Line joins are drawn at the corner of a closed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.worker.js
index 299527e410e..fab1c63ece5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.closed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Line joins are drawn at the corner of a closed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.html
index 6d838d74e2c..0d07bfa68ca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting lineJoin to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,7 +40,6 @@ _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
 ctx.lineJoin = 'bevel';
 ctx.lineJoin = 'butt';
 _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js
index 7b55609c5a4..04863e5f0dc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting lineJoin to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
 ctx.lineJoin = 'bevel';
 ctx.lineJoin = 'butt';
 _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.html
index 12575cdf6be..45eb47cf311 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineJoin 'miter' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -50,7 +54,6 @@ _assertPixel(offscreenCanvas, 89,11, 0,255,0,255, "89,11", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255");
 _assertPixel(offscreenCanvas, 91,9, 0,255,0,255, "91,9", "0,255,0,255");
 _assertPixel(offscreenCanvas, 92,8, 0,255,0,255, "92,8", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.worker.js
index 541481416a8..1707301d136 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.miter.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineJoin 'miter' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -46,7 +50,6 @@ _assertPixel(offscreenCanvas, 89,11, 0,255,0,255, "89,11", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255");
 _assertPixel(offscreenCanvas, 91,9, 0,255,0,255, "91,9", "0,255,0,255");
 _assertPixel(offscreenCanvas, 92,8, 0,255,0,255, "92,8", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.html
index 83c3c8d5160..1941b1abf58 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Line joins are not drawn at the corner of an unclosed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.worker.js
index 88c3453cf15..3cad74e9ea3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.open.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Line joins are not drawn at the corner of an unclosed rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.html
index e84246bca00..dc7c8c2bd64 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Line joins are drawn at 180-degree joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.worker.js
index ef79c187e2b..49cda7613e1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.parallel.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Line joins are drawn at 180-degree joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.html
index 5a4085c92cd..54a9ef280f7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineJoin 'round' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -57,7 +61,6 @@ _assertPixel(offscreenCanvas, 86,13, 0,255,0,255, "86,13", "0,255,0,255");
 _assertPixel(offscreenCanvas, 87,13, 0,255,0,255, "87,13", "0,255,0,255");
 _assertPixel(offscreenCanvas, 88,13, 0,255,0,255, "88,13", "0,255,0,255");
 _assertPixel(offscreenCanvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.worker.js
index e7e8f5b0a63..cce888ce946 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.round.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineJoin 'round' is rendered correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -53,7 +57,6 @@ _assertPixel(offscreenCanvas, 86,13, 0,255,0,255, "86,13", "0,255,0,255");
 _assertPixel(offscreenCanvas, 87,13, 0,255,0,255, "87,13", "0,255,0,255");
 _assertPixel(offscreenCanvas, 88,13, 0,255,0,255, "88,13", "0,255,0,255");
 _assertPixel(offscreenCanvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.html
index 28b61341bae..737eb486414 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting lineJoin to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineJoin = 'round';
 _assertSame(ctx.lineJoin, 'round', "ctx.lineJoin", "'round'");
 ctx.lineJoin = 'miter';
 _assertSame(ctx.lineJoin, 'miter', "ctx.lineJoin", "'miter'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.worker.js
index 88c61f0bcff..78f0a4559a4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.join.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting lineJoin to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.lineJoin = 'round';
 _assertSame(ctx.lineJoin, 'round', "ctx.lineJoin", "'round'");
 ctx.lineJoin = 'miter';
 _assertSame(ctx.lineJoin, 'miter', "ctx.lineJoin", "'miter'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.html
index a4574585966..14a65ea46e3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Miter joins are drawn correctly with acute angles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,7 +42,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.worker.js
index db332942293..085a4f07c44 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.acute.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Miter joins are drawn correctly with acute angles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.html
index c3f94aa13f4..89eb50918cb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Miter joins are not drawn when the miter limit is exceeded");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.worker.js
index b8c4d737f2c..3fce7b853dd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.exceeded.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Miter joins are not drawn when the miter limit is exceeded");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.html
index 727ed9bf46b..c7cbd823448 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting miterLimit to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
 ctx.miterLimit = 1.5;
 ctx.miterLimit = NaN;
 _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js
index 60a62187086..bd05e5775c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting miterLimit to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
 ctx.miterLimit = 1.5;
 ctx.miterLimit = NaN;
 _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.html
index 8a5d06542c7..f509c5bae66 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.worker.js
index ce7c35deb93..d04fa39e416 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.lineedge.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.html
index 8205c9d1bb2..6e440a9cde1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Miter joins are drawn correctly with obtuse angles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,7 +42,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.worker.js
index 7aeabe5899c..50c22af4dc7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.obtuse.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Miter joins are drawn correctly with obtuse angles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.html
index 2562685830b..6e2a96bbe54 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Miter joins are not drawn when the miter limit is exceeded, on exact right angles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.worker.js
index 0e532f68afe..36e25fb22b8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.rightangle.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Miter joins are not drawn when the miter limit is exceeded, on exact right angles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.html
index f814fa3240f..c0e6ee2beb9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting miterLimit to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.miterLimit = 1/1024;
 _assertSame(ctx.miterLimit, 1/1024, "ctx.miterLimit", "1/1024");
 ctx.miterLimit = 1000;
 _assertSame(ctx.miterLimit, 1000, "ctx.miterLimit", "1000");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js
index b6cb6ef83ee..992d37d21ae 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting miterLimit to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.miterLimit = 1/1024;
 _assertSame(ctx.miterLimit, 1/1024, "ctx.miterLimit", "1/1024");
 ctx.miterLimit = 1000;
 _assertSame(ctx.miterLimit, 1000, "ctx.miterLimit", "1000");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.html
index ec812816565..b8e0ae21ffb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Miter joins are drawn when the miter limit is not quite exceeded");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.worker.js
index 811b042a8be..202c4ef5731 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.miter.within.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Miter joins are drawn when the miter limit is not quite exceeded");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.html
index b7a725c58a8..178527c52b8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.worker.js
index 104c04c3caa..43ce6b7d068 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.union.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.html
index 6a733304d2e..b6b90a1200b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineWidth determines the width of line strokes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -49,7 +53,6 @@ _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.worker.js
index 766da43977b..f3120b6b586 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineWidth determines the width of line strokes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -45,7 +49,6 @@ _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.html
index f2160fa0920..6c609142f08 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting lineWidth to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
 ctx.lineWidth = 1.5;
 ctx.lineWidth = NaN;
 _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js
index 3789b20e0c9..37e270734a6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting lineWidth to invalid values is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
 ctx.lineWidth = 1.5;
 ctx.lineWidth = NaN;
 _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.html
index 0767c856194..e2e36c8c6d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Default lineWidth strokes are affected by scale transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,5, 0,255,0,255, "50,5", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.worker.js
index a2891a74e6e..cff69302ab8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.scaledefault.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Default lineWidth strokes are affected by scale transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,5, 0,255,0,255, "50,5", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.html
index 4553f4b543d..e99770d1790 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Line stroke widths are affected by scale transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -55,7 +59,6 @@ _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.worker.js
index 72e13e257cb..cbdca37ad31 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.transformed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Line stroke widths are affected by scale transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -51,7 +55,6 @@ _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.html
index 748aaaa6012..89a96ab2781 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting lineWidth to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.lineWidth = 1/1024;
 _assertSame(ctx.lineWidth, 1/1024, "ctx.lineWidth", "1/1024");
 ctx.lineWidth = 1000;
 _assertSame(ctx.lineWidth, 1000, "ctx.lineWidth", "1000");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.worker.js
index 4a8680dbe4f..7fa7fe5075a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/line-styles/2d.line.width.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting lineWidth to valid values works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.lineWidth = 1/1024;
 _assertSame(ctx.lineWidth, 1/1024, "ctx.lineWidth", "1/1024");
 ctx.lineWidth = 1000;
 _assertSame(ctx.lineWidth, 1000, "ctx.lineWidth", "1000");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.html
index 56c147b9de2..000fb5535dc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws pi/2 .. -pi anticlockwise correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.worker.js
index a0ac90e470e..da057ed3782 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws pi/2 .. -pi anticlockwise correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.html
index 3c108aaac24..9a9c6cd20d8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws -3pi/2 .. -pi anticlockwise correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.worker.js
index eff7e0fe8dd..f1b07ead5da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws -3pi/2 .. -pi anticlockwise correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.html
index 31f1c1cb97d..f06d700a6fd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() wraps angles mod 2pi when anticlockwise and end > start+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.worker.js
index 1a6354034e6..0ea67c58e40 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() wraps angles mod 2pi when anticlockwise and end > start+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.html
index 052c12163f2..b076c59c54d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws a full circle when clockwise and end > start+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.worker.js
index 1d5b3cad502..c6d19c60c02 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws a full circle when clockwise and end > start+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.html
index c8c9a8eada5..486931f03e3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() wraps angles mod 2pi when clockwise and start > end+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.worker.js
index caed42b22cf..dc3200d23aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() wraps angles mod 2pi when clockwise and start > end+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.html
index 52f37a9b76c..7eb466af4be 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws a full circle when anticlockwise and start > end+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.worker.js
index 8e8f6aff5e0..486027e2e41 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.angle.6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws a full circle when anticlockwise and start > end+2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.html
index ec5f6336044..ed27040896e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with missing last argument defaults to clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, -Math.PI, Math.PI/2);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.worker.js
index 48cb110d067..0eaf8bac6db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.default.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with missing last argument defaults to clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, -Math.PI, Math.PI/2);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.html
index 1974a0aed58..99b43e07c45 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with an empty path does not draw a straight line to the start point");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.worker.js
index 70a8aa22195..bdad7779807 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with an empty path does not draw a straight line to the start point");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.html
index 6d4e8deb44b..2a908af077e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() adds the end point of the arc to the subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.arc(-100, 0, 25, -Math.PI/2, Math.PI/2, true);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.worker.js
index 47c6e4f4fb1..edbb7324997 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.end.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() adds the end point of the arc to the subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.arc(-100, 0, 25, -Math.PI/2, Math.PI/2, true);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.html
index 5510124d391..38b7b8679ea 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("arc() with negative radius throws INDEX_SIZE_ERR");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("INDEX_SIZE_ERR", function() { ctx.arc(0, 0, -1, 0, 0, true); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js
index 7247a429229..e8488a0abba 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with negative radius throws INDEX_SIZE_ERR");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("INDEX_SIZE_ERR", function() { ctx.arc(0, 0, -1, 0, 0, true); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.html
index c6acfa94f77..0f892d8692f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with a non-empty path does draw a straight line to the start point");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.moveTo(0, 25);
 ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.worker.js
index 64bda0d3d48..02dcd7b8bd6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonempty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with a non-empty path does draw a straight line to the start point");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.moveTo(0, 25);
 ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.html
index 2ed6dcefa83..28e4a8d3765 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -67,7 +71,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.worker.js
index 50bb057f93c..ce3f82a0228 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -63,7 +67,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.html
index e46c7fa6302..6e973c348ef 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Non-uniformly scaled arcs are the right shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -43,7 +47,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.worker.js
index d2f67d51f04..27ed844a9ef 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Non-uniformly scaled arcs are the right shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -39,7 +43,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.html
index 57eaffd3db4..8e57b0c6b0c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Highly scaled arcs are the right shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.worker.js
index f99db078a08..8cb14eb94c1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.scale.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Highly scaled arcs are the right shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.html
index fa22b54e8eb..95bd87a2202 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with lineWidth > 2*radius is drawn sensibly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.arc(0, 0, 25, 0, -Math.PI/2, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.worker.js
index c252201a221..2b2b476b597 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with lineWidth > 2*radius is drawn sensibly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.arc(0, 0, 25, 0, -Math.PI/2, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.html
index 4f784d009e9..857b7c105d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with lineWidth > 2*radius is drawn sensibly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 97,1, 0,255,0,255, "97,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 97,2, 0,255,0,255, "97,2", "0,255,0,255");
 _assertPixel(offscreenCanvas, 97,3, 0,255,0,255, "97,3", "0,255,0,255");
 _assertPixel(offscreenCanvas, 2,48, 0,255,0,255, "2,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.worker.js
index ece76ae631c..b2eb3e30701 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.selfintersect.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with lineWidth > 2*radius is drawn sensibly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 97,1, 0,255,0,255, "97,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 97,2, 0,255,0,255, "97,2", "0,255,0,255");
 _assertPixel(offscreenCanvas, 97,3, 0,255,0,255, "97,3", "0,255,0,255");
 _assertPixel(offscreenCanvas, 2,48, 0,255,0,255, "2,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.html
index 0e093207ad4..4a5041a9046 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() from 0 to pi does not draw anything in the wrong half");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.worker.js
index b8cce2e805a..45bf3b1def3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() from 0 to pi does not draw anything in the wrong half");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.html
index 65f08288f26..42fa408b414 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() from 0 to pi draws stuff in the right half");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.worker.js
index 57101128cdb..5e895320eb5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() from 0 to pi draws stuff in the right half");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.html
index 39964ad38aa..dd51da10239 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() from 0 to -pi/2 does not draw anything in the wrong quadrant");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.worker.js
index 865d323e006..583cf6dad87 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() from 0 to -pi/2 does not draw anything in the wrong quadrant");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.html
index 4f4ad644533..a66ad11bb80 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() from 0 to -pi/2 draws stuff in the right quadrant");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.worker.js
index 4cd21988853..5f86f2c023c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() from 0 to -pi/2 draws stuff in the right quadrant");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.html
index e0498710ab6..a4a9dcfd211 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() from 0 to 5pi does not draw crazy things");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.worker.js
index e51809bf974..2c77be6449e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.shape.5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() from 0 to 5pi does not draw crazy things");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.html
index d9ee756d631..40bb5764ac4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws nothing when end = start + 2pi-e and anticlockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.worker.js
index 0d3d5e3ae86..c2852f387ad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws nothing when end = start + 2pi-e and anticlockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.html
index ca156fc830e..09014e7c7c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws a full circle when end = start + 2pi-e and clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.worker.js
index 219a4e5ede9..c07fd1ceb12 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws a full circle when end = start + 2pi-e and clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.html
index 19fc9419361..2bc000877f4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws a full circle when end = start + 2pi+e and anticlockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.worker.js
index 7eb04e60a44..eecce05b8c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws a full circle when end = start + 2pi+e and anticlockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.html
index 9e5bd7507d8..f5f05fc8a3d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws nothing when end = start + 2pi+e and clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.worker.js
index 180973aae64..618fd4265da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.twopie.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws nothing when end = start + 2pi+e and clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.html
index 38f5634cd71..bf77486efae 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws nothing when startAngle = endAngle and anticlockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 0, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.worker.js
index 1e99bfd6adb..489c1e9506e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws nothing when startAngle = endAngle and anticlockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 0, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.html
index b5bc72d9c1d..730e2f65c09 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() draws nothing when startAngle = endAngle and clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 0, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.worker.js
index 21b1c9b2dd5..dad25fbfee5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zero.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() draws nothing when startAngle = endAngle and clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 0, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.html
index 99ea73b1193..c4953dfeef1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arc() with zero radius draws a line to the start point");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.moveTo(0, 25);
 ctx.arc(200, 25, 0, 0, Math.PI, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.worker.js
index 324c79962c0..589880713ab 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arc.zeroradius.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arc() with zero radius draws a line to the start point");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.moveTo(0, 25);
 ctx.arc(200, 25, 0, 0, Math.PI, true);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.html
index 9699be4b4a2..2082deeecfe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() has no effect if P0 = P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.worker.js
index a895be35f93..2408e14daa7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() has no effect if P0 = P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.html
index 65fd0f45015..cf64ae72ae3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() draws a straight line to P1 if P1 = P2");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.moveTo(0, 25);
 ctx.arcTo(100, 25, 100, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.worker.js
index 8b0a8c68d7f..33c64624b29 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.coincide.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() draws a straight line to P1 if P1 = P2");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.moveTo(0, 25);
 ctx.arcTo(100, 25, 100, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.html
index 9b984b81f7c..1f81565e541 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.moveTo(-100, 25);
 ctx.arcTo(0, 25, 100, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.worker.js
index 2423836358c..71264aac159 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(-100, 25);
 ctx.arcTo(0, 25, 100, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.html
index d23e3376d3e..474795c2717 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() with all points on a line, and P2 between P0/P1, draws a straight line to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.moveTo(100, 25);
 ctx.arcTo(200, 25, 110, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.worker.js
index 8ec2f81b082..810d27cc5da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with all points on a line, and P2 between P0/P1, draws a straight line to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(100, 25);
 ctx.arcTo(200, 25, 110, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.html
index b7d7c750f62..b9a03add26d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() with all points on a line, and P0 between P1/P2, draws a straight line to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ ctx.moveTo(-100, 25);
 ctx.arcTo(0, 25, -200, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.worker.js
index 971c16cf704..df899e80463 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.collinear.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with all points on a line, and P0 between P1/P2, draws a straight line to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.moveTo(-100, 25);
 ctx.arcTo(0, 25, -200, 25, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.html
index c885ed46e00..b4383188620 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the first control point is added (and nothing is drawn up to it)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.arcTo(100, 50, 200, 50, 0.1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js
index 559fcbe37ea..9a8ae057e6a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the first control point is added (and nothing is drawn up to it)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.arcTo(100, 50, 200, 50, 0.1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.html
index 8a153c06cbd..5b54bd29b6e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the first control point is added");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.arcTo(0, 25, 50, 250, 0.1); // adds (x1,y1), draws nothing
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js
index 38364cbe341..c7f74408175 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the first control point is added");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.arcTo(0, 25, 50, 250, 0.1); // adds (x1,y1), draws nothing
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.html
index 7536b381cce..0bd6eb2dbb5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("arcTo() with negative radius throws an exception");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("INDEX_SIZE_ERR", function() { ctx.arcTo(0, 0, 0, 0, -1); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js
index 47e6ce5de7d..55ecf54c381 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with negative radius throws an exception");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws("INDEX_SIZE_ERR", function() { ctx.arcTo(0, 0, 0, 0, -1); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.html
index 3fcd6dda763..437e805b0a9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -65,7 +69,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.worker.js
index 231df914f69..c9aa6824c10 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -61,7 +65,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.html
index 73a127b728b..0c153bd02ee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo scales the curve, not just the control points");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,7 +39,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.worker.js
index 222402f4077..deb2e75aa95 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.scale.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo scales the curve, not just the control points");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.html
index dcd610a1136..c1191b12f60 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() curves in the right kind of shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -46,7 +50,6 @@ _assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255");
 _assertPixel(offscreenCanvas, 65,45, 0,255,0,255, "65,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.worker.js
index 50c8f79d761..08c29112a56 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() curves in the right kind of shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -42,7 +46,6 @@ _assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255");
 _assertPixel(offscreenCanvas, 65,45, 0,255,0,255, "65,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.html
index 6b3a9ba0fd6..f052a78985f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() curves in the right kind of shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -45,7 +49,6 @@ _assertPixel(offscreenCanvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.worker.js
index f46fe456039..4acb94a60b8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.curve2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() curves in the right kind of shape");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,7 +45,6 @@ _assertPixel(offscreenCanvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255");
 _assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.html
index d5e1793c5cd..50296237edb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() does not draw anything from P1 to P2");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.worker.js
index e6685e3d455..58c40704ec2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.end.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() does not draw anything from P1 to P2");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.html
index 6419097c7fd..75a1e8cbfca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() draws a straight line from P0 to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.worker.js
index 480383287a9..88d774b75f0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.shape.start.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() draws a straight line from P0 to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.html
index d768d507751..d5335e8f279 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo joins up to the last subpath point correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.worker.js
index 909e4a0825d..489e06f6a3c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.transformation.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo joins up to the last subpath point correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.html
index b6079956f40..9e68e5cd470 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() with zero radius draws a straight line from P0 to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.moveTo(0, -25);
 ctx.arcTo(50, -25, 50, 50, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.worker.js
index a76f6380776..d2b62388ec8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with zero radius draws a straight line from P0 to P1");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(0, -25);
 ctx.arcTo(50, -25, 50, 50, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.html
index 7fde228c5ff..60418e77fad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.moveTo(100, 25);
 ctx.arcTo(200, 25, 50, 25, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.worker.js
index 623d98a7e97..4174e308524 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.arcTo.zero.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(100, 25);
 ctx.arcTo(200, 25, 50, 25, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.html
index 807d7b236ec..be1adc30d1d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.beginPath();
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.worker.js
index cd19472457f..271b689bce5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.beginPath.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.beginPath();
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.html
index 3c7bc765056..56f098384c5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.moveTo(0, 25);
 ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.worker.js
index e9709d877ce..56b0d771915 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.moveTo(0, 25);
 ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html
index b3bf82f2768..0464bbd49f1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the first control point is added (and nothing is drawn up to it)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.bezierCurveTo(100, 50, 200, 50, 200, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js
index 293a4a1978b..e1bcf81ce4d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the first control point is added (and nothing is drawn up to it)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.bezierCurveTo(100, 50, 200, 50, 200, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html
index 825b574835c..dbe8cd2ac61 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the first control point is added");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.bezierCurveTo(0, 25, 100, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js
index 5ba0a488b2d..2688d6b52ed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the first control point is added");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.bezierCurveTo(0, 25, 100, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.html
index 3bf7e92db7a..311390ed5b3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("bezierCurveTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -99,7 +103,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js
index 594716ea332..c636f684cdf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("bezierCurveTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -95,7 +99,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.html
index 8498357a755..97614b2d432 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.worker.js
index 0092822deea..a18da8419d1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.scaled.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.html
index 632862f3476..1f936789117 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.worker.js
index d3a58859a01..3ac23273185 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.bezierCurveTo.shape.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.html
index 0e85dccc44a..7ce45202f85 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.clip();
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.worker.js
index 9c890f980cc..557de1aa6e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.clip();
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.html
index 9f08113e3b9..3903a308ce7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.worker.js
index 40211c98389..6003fc4a994 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.basic.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.html
index e3c2fa7441a..78ee5229db0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.worker.js
index ec0a68795b4..3148c75b5da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.html
index 0da3e708fcc..66e740439b6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.worker.js
index 87dc1081b38..d8cb055c89e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.intersect.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.html
index 56af71667f4..4d10c2c002f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.clip();
 ctx.lineTo(0, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.worker.js
index 6f68df5ffca..37375bcaf34 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.clip();
 ctx.lineTo(0, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.html
index 0290361979b..4514dae71e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.worker.js
index b1c0b0d5e11..18512e0dcad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.clip();
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.html
index 34d6dd1128e..21cd63c94a9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,7 +39,6 @@ ctx.clip();
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.worker.js
index 4583717c952..947d8ff4466 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.clip.winding.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.clip();
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.html
index 6377c26d3ba..2aa0ff3a044 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.closePath();
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.worker.js
index 86cc8d6dceb..1d026f9bb63 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.closePath();
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.html
index c37cce32ce7..561a83bb6d1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.lineTo(200, 25);
 ctx.closePath();
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.worker.js
index 5012c5e30d0..b65ac8d3fdb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.newline.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.lineTo(200, 25);
 ctx.closePath();
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.html
index 0fae83d6137..57632f1ee03 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.closePath();
 ctx.lineTo(1000, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.worker.js
index 1f29f80b867..a2da49bd805 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.closePath.nextpoint.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.closePath();
 ctx.lineTo(1000, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.html
index efc4672f01b..158d52880e7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(0, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.worker.js
index 5393baf5f0d..7a1cc37dfde 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(0, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.html
index 48cadc50e8b..322c9173784 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255");
 _assertPixel(offscreenCanvas, 10,40, 0,255,0,255, "10,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.worker.js
index e3c43751d77..75ca87e6cc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.closed.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255");
 _assertPixel(offscreenCanvas, 10,40, 0,255,0,255, "10,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.html
index 5cd8e52e7d9..662bbbf13f5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.closePath();
 ctx.rect(10, 10, 80, 30);
 ctx.fill();
 _assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.worker.js
index bad067478bb..fc16687b9d7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.overlap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.closePath();
 ctx.rect(10, 10, 80, 30);
 ctx.fill();
 _assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.html
index e98d10805cc..e2724a1fda4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(0, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.worker.js
index aaac3d73a3d..ee97157ea26 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.add.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(0, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.html
index a6e93cd61ae..4dc44222bd3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(100, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.worker.js
index 34f5a1f4d2b..558a35821da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(100, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.html
index dfb5c4ff298..f4c375abf10 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(100, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.worker.js
index 5dda3143c19..94b0a38d2b0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(100, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.html
index 3e4d65d59c7..c6bdf99bd46 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -35,7 +39,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(100, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.worker.js
index a502d8de553..9127446d5b3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.fill.winding.subtract.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.lineTo(100, 50);
 ctx.lineTo(100, 0);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.html
index 476b652c352..b9716ce56ff 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.closePath();
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.worker.js
index 7ecf650f8f8..438b771de48 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.initial.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.closePath();
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html
index e580547d02a..71af369eed7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() works on arcs");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertSame(ctx.isPointInPath(30, 20), false, "ctx.isPointInPath(30, 20)", "fals
 _assertSame(ctx.isPointInPath(70, 20), false, "ctx.isPointInPath(70, 20)", "false");
 _assertSame(ctx.isPointInPath(30, 30), false, "ctx.isPointInPath(30, 30)", "false");
 _assertSame(ctx.isPointInPath(70, 30), false, "ctx.isPointInPath(70, 30)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js
index 97286ea37dc..31eb5455e13 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() works on arcs");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ _assertSame(ctx.isPointInPath(30, 20), false, "ctx.isPointInPath(30, 20)", "fals
 _assertSame(ctx.isPointInPath(70, 20), false, "ctx.isPointInPath(70, 20)", "false");
 _assertSame(ctx.isPointInPath(30, 30), false, "ctx.isPointInPath(30, 30)", "false");
 _assertSame(ctx.isPointInPath(70, 30), false, "ctx.isPointInPath(70, 30)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html
index 60862fd505c..2758cadfd00 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() detects whether the point is inside the path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.rect(0, 0, 20, 20);
 _assertSame(ctx.isPointInPath(10, 10), true, "ctx.isPointInPath(10, 10)", "true");
 _assertSame(ctx.isPointInPath(30, 10), false, "ctx.isPointInPath(30, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js
index 5f9478ab067..f3bf8daad2d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() detects whether the point is inside the path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.rect(0, 0, 20, 20);
 _assertSame(ctx.isPointInPath(10, 10), true, "ctx.isPointInPath(10, 10)", "true");
 _assertSame(ctx.isPointInPath(30, 10), false, "ctx.isPointInPath(30, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html
index b019c7435f5..33d231cb3e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() detects whether the point is inside the path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.rect(20, 0, 20, 20);
 _assertSame(ctx.isPointInPath(10, 10), false, "ctx.isPointInPath(10, 10)", "false");
 _assertSame(ctx.isPointInPath(30, 10), true, "ctx.isPointInPath(30, 10)", "true");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js
index 75bc7f04450..bc1ac01d2e7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() detects whether the point is inside the path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 ctx.rect(20, 0, 20, 20);
 _assertSame(ctx.isPointInPath(10, 10), false, "ctx.isPointInPath(10, 10)", "false");
 _assertSame(ctx.isPointInPath(30, 10), true, "ctx.isPointInPath(30, 10)", "true");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html
index 3cb2b6f7165..ee3a21dfb14 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() works on Bezier curves");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,7 +42,6 @@ _assertSame(ctx.isPointInPath(70, 20), false, "ctx.isPointInPath(70, 20)", "fals
 _assertSame(ctx.isPointInPath(70, 30), true, "ctx.isPointInPath(70, 30)", "true");
 _assertSame(ctx.isPointInPath(75, 20), false, "ctx.isPointInPath(75, 20)", "false");
 _assertSame(ctx.isPointInPath(75, 30), false, "ctx.isPointInPath(75, 30)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js
index b76f8b7d4d9..203b1c84062 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() works on Bezier curves");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertSame(ctx.isPointInPath(70, 20), false, "ctx.isPointInPath(70, 20)", "fals
 _assertSame(ctx.isPointInPath(70, 30), true, "ctx.isPointInPath(70, 30)", "true");
 _assertSame(ctx.isPointInPath(75, 20), false, "ctx.isPointInPath(75, 20)", "false");
 _assertSame(ctx.isPointInPath(75, 30), false, "ctx.isPointInPath(75, 30)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html
index 6eabd0f7274..2d4a2d4c098 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() works on unclosed arcs larger than 2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertSame(ctx.isPointInPath(30, 20), false, "ctx.isPointInPath(30, 20)", "fals
 _assertSame(ctx.isPointInPath(70, 20), false, "ctx.isPointInPath(70, 20)", "false");
 _assertSame(ctx.isPointInPath(30, 30), false, "ctx.isPointInPath(30, 30)", "false");
 _assertSame(ctx.isPointInPath(70, 30), false, "ctx.isPointInPath(70, 30)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js
index ce1d67cf453..632b7ea2511 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() works on unclosed arcs larger than 2pi");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ _assertSame(ctx.isPointInPath(30, 20), false, "ctx.isPointInPath(30, 20)", "fals
 _assertSame(ctx.isPointInPath(70, 20), false, "ctx.isPointInPath(70, 20)", "false");
 _assertSame(ctx.isPointInPath(30, 30), false, "ctx.isPointInPath(30, 30)", "false");
 _assertSame(ctx.isPointInPath(70, 30), false, "ctx.isPointInPath(70, 30)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html
index 7daafd5cdd6..66600307a44 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() counts points on the path as being inside");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertSame(ctx.isPointInPath(10, -0.01), false, "ctx.isPointInPath(10, -0.01)",
 _assertSame(ctx.isPointInPath(10, 20.01), false, "ctx.isPointInPath(10, 20.01)", "false");
 _assertSame(ctx.isPointInPath(-0.01, 10), false, "ctx.isPointInPath(-0.01, 10)", "false");
 _assertSame(ctx.isPointInPath(20.01, 10), false, "ctx.isPointInPath(20.01, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js
index 3211f833a59..d7d1e3f9099 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() counts points on the path as being inside");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertSame(ctx.isPointInPath(10, -0.01), false, "ctx.isPointInPath(10, -0.01)",
 _assertSame(ctx.isPointInPath(10, 20.01), false, "ctx.isPointInPath(10, 20.01)", "false");
 _assertSame(ctx.isPointInPath(-0.01, 10), false, "ctx.isPointInPath(-0.01, 10)", "false");
 _assertSame(ctx.isPointInPath(20.01, 10), false, "ctx.isPointInPath(20.01, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html
index fac24404e48..5061f7f4711 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("isPointInPath() works when there is no path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.isPointInPath(0, 0), false, "ctx.isPointInPath(0, 0)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js
index 6574b9e8e6e..795238357c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() works when there is no path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.isPointInPath(0, 0), false, "ctx.isPointInPath(0, 0)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html
index 2db49e11971..dec47b205aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() returns false for non-finite arguments");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.isPointInPath(0, Infinity), false, "ctx.isPointInPath(0, Infinit
 _assertSame(ctx.isPointInPath(0, -Infinity), false, "ctx.isPointInPath(0, -Infinity)", "false");
 _assertSame(ctx.isPointInPath(0, NaN), false, "ctx.isPointInPath(0, NaN)", "false");
 _assertSame(ctx.isPointInPath(NaN, NaN), false, "ctx.isPointInPath(NaN, NaN)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js
index eb9df1bb959..86f292c4696 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() returns false for non-finite arguments");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _assertSame(ctx.isPointInPath(0, Infinity), false, "ctx.isPointInPath(0, Infinit
 _assertSame(ctx.isPointInPath(0, -Infinity), false, "ctx.isPointInPath(0, -Infinity)", "false");
 _assertSame(ctx.isPointInPath(0, NaN), false, "ctx.isPointInPath(0, NaN)", "false");
 _assertSame(ctx.isPointInPath(NaN, NaN), false, "ctx.isPointInPath(NaN, NaN)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html
index 19f8dc0b93a..2c3e403a247 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() works on paths outside the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.isPointInPath(10, -70), false, "ctx.isPointInPath(10, -70)", "fa
 _assertSame(ctx.isPointInPath(30, -20), false, "ctx.isPointInPath(30, -20)", "false");
 _assertSame(ctx.isPointInPath(30, 0), true, "ctx.isPointInPath(30, 0)", "true");
 _assertSame(ctx.isPointInPath(30, 20), false, "ctx.isPointInPath(30, 20)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js
index e9c84d8d9c3..6fdd72fc78f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() works on paths outside the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _assertSame(ctx.isPointInPath(10, -70), false, "ctx.isPointInPath(10, -70)", "fa
 _assertSame(ctx.isPointInPath(30, -20), false, "ctx.isPointInPath(30, -20)", "false");
 _assertSame(ctx.isPointInPath(30, 0), true, "ctx.isPointInPath(30, 0)", "true");
 _assertSame(ctx.isPointInPath(30, 20), false, "ctx.isPointInPath(30, 20)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html
index 11f5c10a5ba..30b04590f54 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() uses the current path, not just the subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.rect(40, 0, 20, 20);
 _assertSame(ctx.isPointInPath(10, 10), false, "ctx.isPointInPath(10, 10)", "false");
 _assertSame(ctx.isPointInPath(30, 10), true, "ctx.isPointInPath(30, 10)", "true");
 _assertSame(ctx.isPointInPath(50, 10), true, "ctx.isPointInPath(50, 10)", "true");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js
index a20f470dc79..cf34169d603 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() uses the current path, not just the subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.rect(40, 0, 20, 20);
 _assertSame(ctx.isPointInPath(10, 10), false, "ctx.isPointInPath(10, 10)", "false");
 _assertSame(ctx.isPointInPath(30, 10), true, "ctx.isPointInPath(30, 10)", "true");
 _assertSame(ctx.isPointInPath(50, 10), true, "ctx.isPointInPath(50, 10)", "true");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html
index 5547bc74c3e..a2ce0fbfc7a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.isPointInPath(49, 10), false, "ctx.isPointInPath(49, 10)", "fals
 _assertSame(ctx.isPointInPath(51, 10), true, "ctx.isPointInPath(51, 10)", "true");
 _assertSame(ctx.isPointInPath(69, 10), true, "ctx.isPointInPath(69, 10)", "true");
 _assertSame(ctx.isPointInPath(71, 10), false, "ctx.isPointInPath(71, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js
index 65a12a2d7af..a086a8e2223 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _assertSame(ctx.isPointInPath(49, 10), false, "ctx.isPointInPath(49, 10)", "fals
 _assertSame(ctx.isPointInPath(51, 10), true, "ctx.isPointInPath(51, 10)", "true");
 _assertSame(ctx.isPointInPath(69, 10), true, "ctx.isPointInPath(69, 10)", "true");
 _assertSame(ctx.isPointInPath(71, 10), false, "ctx.isPointInPath(71, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html
index 741aebf4413..20cf26e44da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.isPointInPath(49, 10), false, "ctx.isPointInPath(49, 10)", "fals
 _assertSame(ctx.isPointInPath(51, 10), true, "ctx.isPointInPath(51, 10)", "true");
 _assertSame(ctx.isPointInPath(69, 10), true, "ctx.isPointInPath(69, 10)", "true");
 _assertSame(ctx.isPointInPath(71, 10), false, "ctx.isPointInPath(71, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js
index 0fac30a33ed..759615962aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _assertSame(ctx.isPointInPath(49, 10), false, "ctx.isPointInPath(49, 10)", "fals
 _assertSame(ctx.isPointInPath(51, 10), true, "ctx.isPointInPath(51, 10)", "true");
 _assertSame(ctx.isPointInPath(69, 10), true, "ctx.isPointInPath(69, 10)", "true");
 _assertSame(ctx.isPointInPath(71, 10), false, "ctx.isPointInPath(71, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html
index 37ca18c4b74..2c10a7b2775 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.isPointInPath(49, 10), false, "ctx.isPointInPath(49, 10)", "fals
 _assertSame(ctx.isPointInPath(51, 10), true, "ctx.isPointInPath(51, 10)", "true");
 _assertSame(ctx.isPointInPath(69, 10), true, "ctx.isPointInPath(69, 10)", "true");
 _assertSame(ctx.isPointInPath(71, 10), false, "ctx.isPointInPath(71, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js
index 26fa7d350a0..694b0738347 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _assertSame(ctx.isPointInPath(49, 10), false, "ctx.isPointInPath(49, 10)", "fals
 _assertSame(ctx.isPointInPath(51, 10), true, "ctx.isPointInPath(51, 10)", "true");
 _assertSame(ctx.isPointInPath(69, 10), true, "ctx.isPointInPath(69, 10)", "true");
 _assertSame(ctx.isPointInPath(71, 10), false, "ctx.isPointInPath(71, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html
index 3303453d0ad..62f8edf9571 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.translate(0, 50);
 _assertSame(ctx.isPointInPath(60, 10), false, "ctx.isPointInPath(60, 10)", "false");
 _assertSame(ctx.isPointInPath(110, 10), true, "ctx.isPointInPath(110, 10)", "true");
 _assertSame(ctx.isPointInPath(110, 60), false, "ctx.isPointInPath(110, 60)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js
index 0ec73147be4..a41b4aee5b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() handles transformations correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.translate(0, 50);
 _assertSame(ctx.isPointInPath(60, 10), false, "ctx.isPointInPath(60, 10)", "false");
 _assertSame(ctx.isPointInPath(110, 10), true, "ctx.isPointInPath(110, 10)", "true");
 _assertSame(ctx.isPointInPath(110, 60), false, "ctx.isPointInPath(110, 60)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html
index 08a8ea7b795..32e5742855a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() works on unclosed subpaths");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineTo(20, 20);
 ctx.lineTo(0, 20);
 _assertSame(ctx.isPointInPath(10, 10), true, "ctx.isPointInPath(10, 10)", "true");
 _assertSame(ctx.isPointInPath(30, 10), false, "ctx.isPointInPath(30, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js
index 8e9a83d7a31..b8ce8334e48 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() works on unclosed subpaths");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.lineTo(20, 20);
 ctx.lineTo(0, 20);
 _assertSame(ctx.isPointInPath(10, 10), true, "ctx.isPointInPath(10, 10)", "true");
 _assertSame(ctx.isPointInPath(30, 10), false, "ctx.isPointInPath(30, 10)", "false");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html
index 2b715291780..16b18d77e61 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("isPointInPath() uses the non-zero winding number rule");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,7 +40,6 @@ _assertSame(ctx.isPointInPath(45, 25), true, "ctx.isPointInPath(45, 25)", "true"
 _assertSame(ctx.isPointInPath(5, 45), true, "ctx.isPointInPath(5, 45)", "true");
 _assertSame(ctx.isPointInPath(25, 45), true, "ctx.isPointInPath(25, 45)", "true");
 _assertSame(ctx.isPointInPath(45, 45), true, "ctx.isPointInPath(45, 45)", "true");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js
index 37978d4199f..b1e8fdd49ed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("isPointInPath() uses the non-zero winding number rule");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertSame(ctx.isPointInPath(45, 25), true, "ctx.isPointInPath(45, 25)", "true"
 _assertSame(ctx.isPointInPath(5, 45), true, "ctx.isPointInPath(5, 45)", "true");
 _assertSame(ctx.isPointInPath(25, 45), true, "ctx.isPointInPath(25, 45)", "true");
 _assertSame(ctx.isPointInPath(45, 45), true, "ctx.isPointInPath(45, 45)", "true");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.html
index 56eed8ed701..ff8241b1561 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.moveTo(0, 25);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.worker.js
index 99499e30fb5..ea2ff8371fc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.moveTo(0, 25);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.html
index 96efe4773bd..9a8feb1ad72 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the point is added and nothing is drawn");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.lineTo(100, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js
index c988b989ee2..dc3d5008070 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the point is added and nothing is drawn");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.lineTo(100, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.html
index 5189d6b17df..dbc21f306b4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the point is added and used for subsequent drawing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.lineTo(0, 25);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js
index e593e8ed0b0..a343766ca29 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the point is added and used for subsequent drawing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.lineTo(0, 25);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.html
index 4b954ed81b8..8f3e74a865c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(0, 25);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.worker.js
index d01768b5e42..968fd47c92b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nextpoint.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineTo(0, 25);
 ctx.lineTo(100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html
index 82b0284b612..50427b430a0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineTo() with Infinity/NaN for first arg still converts the second arg");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ for (var arg1 of [Infinity, -Infinity, NaN]) {
   ctx.lineTo(arg1, { valueOf: function() { converted = true; return 0; } });
   _assert(converted, "converted");
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js
index 8190df7b7f5..37651bc2f86 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineTo() with Infinity/NaN for first arg still converts the second arg");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ for (var arg1 of [Infinity, -Infinity, NaN]) {
   ctx.lineTo(arg1, { valueOf: function() { converted = true; return 0; } });
   _assert(converted, "converted");
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.html
index 45d13e8bb34..7282316776d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("lineTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.worker.js
index 7f48abc8486..078f1b3e917 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("lineTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.html
index 29c4c7920af..cc38e922271 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 90,25, 0,255,0,255, "90,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.worker.js
index 9d7e6fb8212..efa7be4b43a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineTo(100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 90,25, 0,255,0,255, "90,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.html
index a3896ab46a9..f6244095dad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.worker.js
index ba3d51b6ae2..83d8d678373 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.multiple.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.html
index 48bae9b76ee..96d27b65083 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(0, 50);
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.worker.js
index afc53642a57..9188c660571 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.newsubpath.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.moveTo(0, 50);
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.html
index ee79f44621e..d755a466b64 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("moveTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.lineTo(0, 50);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.worker.js
index 6b7283d9437..647524f14e5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.moveTo.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("moveTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(0, 50);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.html
index 469ec668cf8..f001f9d1e25 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.moveTo(0, 25);
 ctx.quadraticCurveTo(100, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.worker.js
index 22ff451faa5..473ea9d00af 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.moveTo(0, 25);
 ctx.quadraticCurveTo(100, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html
index 3e2155f879a..ed94789fe6f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the first control point is added (and nothing is drawn up to it)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.quadraticCurveTo(100, 50, 200, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js
index af4cf923b15..6f675a6ea22 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the first control point is added (and nothing is drawn up to it)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.quadraticCurveTo(100, 50, 200, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html
index 8159f3c6026..579c335047a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("If there is no subpath, the first control point is added");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.quadraticCurveTo(0, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js
index ede934f66ed..bef063c1de1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("If there is no subpath, the first control point is added");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.quadraticCurveTo(0, 25, 100, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.html
index 4a5711c5134..c0c66ff236f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("quadraticCurveTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -47,7 +51,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js
index dc267cc5809..263e8428a3a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("quadraticCurveTo() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -43,7 +47,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.html
index 6bcd8c678ee..34139a68975 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.worker.js
index 6bb0c1af035..770ab938f7a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.scaled.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.html
index 6caaf2a03b8..f5e55e3f1df 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.worker.js
index 23b5124bd0f..9ff84e22f1c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.shape.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.html
index e786320d754..01ee0255c31 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#0f0';
 ctx.rect(0, 0, 100, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.worker.js
index 9aa3af8db7d..d63b7520cc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#0f0';
 ctx.rect(0, 0, 100, 50);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.html
index 85e72a2139d..d2a832a9142 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.lineJoin = 'miter';
 ctx.rect(100, 50, 100, 100);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.worker.js
index 09c942c87a0..b772fb0e94d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.closed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.lineJoin = 'miter';
 ctx.rect(100, 50, 100, 100);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.html
index 5317b3b7e86..5923620b684 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.rect(200, 100, 400, 1000);
 ctx.lineTo(-2000, -1000);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.worker.js
index 45e25585b6f..d2757ee491a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.rect(200, 100, 400, 1000);
 ctx.lineTo(-2000, -1000);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.html
index 25ab2897d3b..065b0a0ebcf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.worker.js
index 925d3510128..04016e19ac5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.end.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.html
index 2b47aa0db82..d9e68d19138 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.worker.js
index 88a8acc7ef7..4e2900f36f8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.html
index 1c41d98b9be..b7bb7845ba7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(-50, 25);
 ctx.rect(200, 25, 1, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.worker.js
index 9d3562ce420..0745ebf23fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.newsubpath.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.lineTo(-50, 25);
 ctx.rect(200, 25, 1, 1);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.html
index 0af2beec57d..45fd55ddac6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -47,7 +51,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.worker.js
index 8533f257707..144232e645f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rect() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -43,7 +47,6 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.html
index 4478ecbb7ee..cf37f76215f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.rect(45, 20, 10, 10);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.worker.js
index 50cc700b4af..ccc806e59ee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.selfintersect.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.rect(45, 20, 10, 10);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.html
index b1ec5e2beb2..5df38c1065a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.worker.js
index 4f37705e967..bff03a4104d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.winding.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ _assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.html
index 5dc5eb52b3c..f3f4221a372 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.rect(0, 50, 100, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.worker.js
index c64d9ef866a..397cae19703 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.rect(0, 50, 100, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.html
index 83925f67be4..e86aa532aee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.rect(50, -100, 0, 250);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.worker.js
index 698e277f1fc..8a87de8e4c5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.rect(50, -100, 0, 250);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.html
index ad6d3be7f72..5c7e81f43e5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.beginPath();
 ctx.rect(50, 25, 0, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.worker.js
index 021a8d1d17b..9799ae29990 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.beginPath();
 ctx.rect(50, 25, 0, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.html
index ce2601f282f..4445a50c237 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.rect(100, 25, 0, 0);
 ctx.lineTo(0, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.worker.js
index 6b8f1cf76b3..f137c075faf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.rect(100, 25, 0, 0);
 ctx.lineTo(0, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.html
index ae1c5dcfe4f..ab46d4d84ae 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.moveTo(0, 0);
 ctx.rect(100, 25, 0, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.worker.js
index ca87c25992f..c3db0aea883 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.moveTo(0, 0);
 ctx.rect(100, 25, 0, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.html
index 625c03bea4e..736daf9f96c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.beginPath();
 ctx.rect(100, 25, 1000, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.worker.js
index 855d0226bfb..3b0ca64d2ae 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.rect.zero.6.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.beginPath();
 ctx.rect(100, 25, 1000, 0);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.html
index e16937de52f..c29477e2dee 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Empty subpaths are not stroked");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.moveTo(40, 25);
 ctx.moveTo(60, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.worker.js
index 0fcc8dd22db..23503804787 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Empty subpaths are not stroked");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.moveTo(40, 25);
 ctx.moveTo(60, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.html
index 50ceecd7e51..aea20b2bb31 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Stroked subpaths are combined before being drawn");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(0, 30);
 ctx.lineTo(100, 30);
 ctx.stroke();
 _assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.worker.js
index b70e65be737..d97cfbca80f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.overlap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Stroked subpaths are combined before being drawn");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.moveTo(0, 30);
 ctx.lineTo(100, 30);
 ctx.stroke();
 _assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.html
index 76746a9cdca..e323ce17948 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Zero-length line segments from arcTo and arc are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.moveTo(60, 25);
 ctx.arc(50, 25, 10, 0, 0, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.worker.js
index 40ee31a718c..812d710dae5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.arc.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Zero-length line segments from arcTo and arc are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.moveTo(60, 25);
 ctx.arc(50, 25, 10, 0, 0, false);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.html
index 06a173b5b3d..da72c69177b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Zero-length line segments from closed paths are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.lineTo(50, 25);
 ctx.closePath();
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.worker.js
index 27176fa6aba..407984ca2a4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.closed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Zero-length line segments from closed paths are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.lineTo(50, 25);
 ctx.closePath();
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.html
index b5f5209082d..27962cb23a0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Zero-length line segments are removed before stroking with miters");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.lineTo(-100, 200);
 ctx.lineTo(-100, 1000);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.worker.js
index 835d36fdf76..20e9e4b235d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.corner.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Zero-length line segments are removed before stroking with miters");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.lineTo(-100, 200);
 ctx.lineTo(-100, 1000);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.html
index 60c13bbca28..62a39bf9934 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.moveTo(50, 25);
 ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.worker.js
index 8bc8ec15cdc..1ad6d9a6109 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.curve.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.moveTo(50, 25);
 ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.html
index c40f61c69ed..1818c72a81a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Zero-length line segments from lineTo are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.moveTo(50, 25);
 ctx.lineTo(50, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.worker.js
index d9dc3ac1eac..ad1ca830806 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.line.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Zero-length line segments from lineTo are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.moveTo(50, 25);
 ctx.lineTo(50, 25);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.html
index 74d60f774d2..d2656ab3953 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Zero-length line segments from rect and strokeRect are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.rect(50, 25, 0, 0);
 ctx.stroke();
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.worker.js
index 751589791a1..102b6c14292 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.prune.rect.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Zero-length line segments from rect and strokeRect are removed before stroking");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.rect(50, 25, 0, 0);
 ctx.stroke();
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.html
index 328adf1de76..59b4e0e0a26 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Stroke line widths are scaled by the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,7 +45,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.worker.js
index 7996b61c3d9..2453426cfeb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Stroke line widths are scaled by the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -37,7 +41,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.html
index fc49feaffeb..905c04ab41c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Stroke line widths are scaled by the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -43,7 +47,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.worker.js
index 5d70b6a8a6f..33e1dcdc157 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.scale2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Stroke line widths are scaled by the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -39,7 +43,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.html
index cfa6560fba8..68969657211 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Strokes lines are skewed by the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -56,7 +60,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.worker.js
index 2d4e84e1c04..b204bed1c1d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.skew.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Strokes lines are skewed by the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -52,7 +56,6 @@ _assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255");
 _assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.html
index 3f9f1de61da..02d97a65579 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Stroking does not start a new path or subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.closePath();
 ctx.strokeStyle = '#0f0';
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.worker.js
index c0444f756af..d929697e583 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Stroking does not start a new path or subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.closePath();
 ctx.strokeStyle = '#0f0';
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.html
index fbc65f12124..da5226becf0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Strokes in opposite directions are unioned, not subtracted");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.moveTo(100, 40);
 ctx.lineTo(0, 40);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.worker.js
index c00ce217170..e84cee173f9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.stroke.union.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Strokes in opposite directions are unioned, not subtracted");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.moveTo(100, 40);
 ctx.lineTo(0, 40);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.html
index e4d9e09e5dc..d8df0e50c09 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.translate(0, -100);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.worker.js
index ea0b9ae9152..a8489b04994 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.translate(0, -100);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.html
index c0a1ffebe94..bbd1e4114b8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Transformations are applied while building paths, not when drawing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.rotate(Math.PI/2);
 ctx.scale(0.1, 0.1);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.worker.js
index 5eb0d6f717f..ff70cc4d9c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.changing.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Transformations are applied while building paths, not when drawing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.rotate(Math.PI/2);
 ctx.scale(0.1, 0.1);
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.html b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.html
index 3ee6d0c76c6..00111ec753d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Transformations are applied while building paths, not when drawing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ ctx.stroke();
 ctx.translate(0, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.worker.js
index 1999c27206d..a8f2379d651 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/path-objects/2d.path.transformation.multiple.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Transformations are applied while building paths, not when drawing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.stroke();
 ctx.translate(0, 50);
 ctx.stroke();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html
index f2c53c263ed..8d4fb29d0f8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("createImageData(imgdata) exists and returns something");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertDifferent(ctx.createImageData(ctx.createImageData(1, 1)), null, "ctx.createImageData(ctx.createImageData(1, 1))", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js
index 40e3da1b6be..8d795ec1ffe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(imgdata) exists and returns something");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertDifferent(ctx.createImageData(ctx.createImageData(1, 1)), null, "ctx.createImageData(ctx.createImageData(1, 1))", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html
index 0ef6d8ae22b..cc895b7144c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createImageData(imgdata) returns transparent black data of the right size");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ for (var i = 0; i < imgdata2.data.length; ++i)
     if (imgdata2.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js
index 68c4a5fe410..257bbd8c579 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(imgdata) returns transparent black data of the right size");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ for (var i = 0; i < imgdata2.data.length; ++i)
     if (imgdata2.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.html
index 1b68df289bc..1000e44c863 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("createImageData(null) throws TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createImageData(null); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.worker.js
index b9cb934f2fc..693fc5927bf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create1.zero.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(null) throws TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.createImageData(null); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html
index 1048cb167e6..3371b9dacb4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("createImageData(sw, sh) exists and returns something");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertDifferent(ctx.createImageData(1, 1), null, "ctx.createImageData(1, 1)", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js
index 3092a317644..36128d98a40 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(sw, sh) exists and returns something");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertDifferent(ctx.createImageData(1, 1), null, "ctx.createImageData(1, 1)", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html
index 55e999a9994..c7c0808236e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createImageData(sw, sh) returns transparent black data of the right size");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ for (var i = 0; i < imgdata.data.length; ++i)
     if (imgdata.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js
index 392711c5cd9..1512210658e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(sw, sh) returns transparent black data of the right size");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ for (var i = 0; i < imgdata.data.length; ++i)
     if (imgdata.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html
index 73d39aa7ba5..5d4b1d0f339 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createImageData(sw, sh) works for sizes much larger than the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assum
     if (imgdata.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js
index 6d97898a6d1..ad34e6d02c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(sw, sh) works for sizes much larger than the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assum
     if (imgdata.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html
index ae862192c23..4c42c6b8dd7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createImageData(sw, sh) takes the absolute magnitude of the size arguments");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js
index c93d1b5b68b..5b2f8eb548c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(sw, sh) takes the absolute magnitude of the size arguments");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html
index 5f0f19254bd..6f8afc0303f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html
@@ -11,6 +11,10 @@
 
 <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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ assert_throws(new TypeError(), function() { ctx.createImageData(10, posinfobj);
 assert_throws(new TypeError(), function() { ctx.createImageData(10, neginfobj); });
 assert_throws(new TypeError(), function() { ctx.createImageData(10, nanobj); });
 assert_throws(new TypeError(), function() { ctx.createImageData(posinfobj, posinfobj); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
index 4c8da252cb1..3f588b0ad6b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ assert_throws(new TypeError(), function() { ctx.createImageData(10, posinfobj);
 assert_throws(new TypeError(), function() { ctx.createImageData(10, neginfobj); });
 assert_throws(new TypeError(), function() { ctx.createImageData(10, nanobj); });
 assert_throws(new TypeError(), function() { ctx.createImageData(posinfobj, posinfobj); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html
index 78db7303941..b1a123af5e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js
index 52b7e843d2e..7a4d7d0853f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html
index 51416182150..43a216cdc60 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("createImageData(sw, sh) throws INDEX_SIZE_ERR if size is zero");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js
index 16573f11390..e64977ca161 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("createImageData(sw, sh) throws INDEX_SIZE_ERR if size is zero");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html
index bf148c945db..f9e730a9ba3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("getImageData() exists and returns something");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertDifferent(ctx.getImageData(0, 0, 100, 50), null, "ctx.getImageData(0, 0, 100, 50)", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js
index 27724a2acf4..d4f4e51fdc3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() exists and returns something");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertDifferent(ctx.getImageData(0, 0, 100, 50), null, "ctx.getImageData(0, 0, 100, 50)", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.html
index 861e3659fc3..ab544a97e57 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() clamps colours to the range [0, 255]");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.worker.js
index 05d22f25ff8..148296ea9bf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.clamp.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() clamps colours to the range [0, 255]");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html
index e269cbc0e35..6dbd9532aa6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns a correctly-sized Uint8ClampedArray");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js
index 762e23374b5..ebb8279f73b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns a correctly-sized Uint8ClampedArray");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html
index c688c22e49f..8d30b552a4a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html
@@ -11,6 +11,10 @@
 
 <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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -65,7 +69,6 @@ assert_throws(new TypeError(), function() { ctx.getImageData(10, posinfobj, posi
 assert_throws(new TypeError(), function() { ctx.getImageData(10, posinfobj, posinfobj, posinfobj); });
 assert_throws(new TypeError(), function() { ctx.getImageData(10, posinfobj, 10, posinfobj); });
 assert_throws(new TypeError(), function() { ctx.getImageData(10, 10, posinfobj, posinfobj); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
index bcf2e43b927..b709ca6e99f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -61,7 +65,6 @@ assert_throws(new TypeError(), function() { ctx.getImageData(10, posinfobj, posi
 assert_throws(new TypeError(), function() { ctx.getImageData(10, posinfobj, posinfobj, posinfobj); });
 assert_throws(new TypeError(), function() { ctx.getImageData(10, posinfobj, 10, posinfobj); });
 assert_throws(new TypeError(), function() { ctx.getImageData(10, 10, posinfobj, posinfobj); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.html
index 666ef2e857f..32f8d52f358 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns non-premultiplied colours");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.worker.js
index 5b98dbc5ffd..269685ecb76 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonpremul.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns non-premultiplied colours");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.html
index ff1c66fd3a2..96e78bcab8f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns A in the fourth component");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.worker.js
index a3423ee5a8c..a97251f6578 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns A in the fourth component");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.html
index 0706cd5a358..8922c3249b3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns leftmost columns first");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.worker.js
index 371ea257056..71aedb59588 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.cols.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns leftmost columns first");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.html
index a5c7d866e75..f6a85938150 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns R then G then B");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.worker.js
index e31ebc92a58..0cc5b8bf870 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rgb.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns R then G then B");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.html
index 5cc141f1323..ecbc0a6e225 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns topmost rows first");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.worker.js
index a942467ff65..0893f5e5a7f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.order.rows.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns topmost rows first");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.html
index 5fb46d0352c..ef168ebf187 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns values in the range [0, 255]");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.worker.js
index f3e93f21bec..cec597485db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.range.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns values in the range [0, 255]");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.html
index 94539ffcb0d..605fd24d56d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() works with negative width and height, and returns top-to-bottom left-to-right");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.worker.js
index 00f6cc53735..cef1c430fe1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() works with negative width and height, and returns top-to-bottom left-to-right");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.html
index f4205318fea..4e4eda8f1a6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns transparent black outside the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -69,7 +73,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.worker.js
index 568dce03b55..763700a0d98 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns transparent black outside the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -65,7 +69,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html
index f811736f4cc..e2c3a1d88c9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() returns bigger ImageData for bigger source rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js
index adf912ba7b6..9c30b2842aa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() returns bigger ImageData for bigger source rectangle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.html
index 3177cd8dc63..371e728d86f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() works for sizes smaller than one pixel");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ var imgdata = ctx.getImageData(0, 0, 0.0001, 0.0001);
 _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
 _assertSame(imgdata.width, 1, "imgdata.width", "1");
 _assertSame(imgdata.height, 1, "imgdata.height", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.worker.js
index 791dac61e5c..ea9136d2c03 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.tiny.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() works for sizes smaller than one pixel");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ var imgdata = ctx.getImageData(0, 0, 0.0001, 0.0001);
 _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
 _assertSame(imgdata.width, 1, "imgdata.width", "1");
 _assertSame(imgdata.height, 1, "imgdata.height", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.html
index 33e65aa8bbf..0d4b06a53fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() is not affected by context state");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.restore();
 ctx.putImageData(imgdata, 50, 0);
 _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.worker.js
index d5cf3c91ef2..17c3103969e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() is not affected by context state");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.restore();
 ctx.putImageData(imgdata, 50, 0);
 _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html
index 5890d365a4b..3c461358222 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getImageData() throws INDEX_SIZE_ERR if size is zero");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js
index 0c0441a715c..a5a963db6c1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getImageData() throws INDEX_SIZE_ERR if size is zero");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -15,7 +19,6 @@ var ctx = offscreenCanvas.getContext('2d');
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html
index be22bae5469..35068ef1c90 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData.data clamps numbers to [0, 255]");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,7 +45,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js
index 07fe8981c80..9da53ead8fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData.data clamps numbers to [0, 255]");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -37,7 +41,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html
index ad05124ddba..b44ab2b2dad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData.data converts NaN to 0");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js
index e888386016a..59502ed5af2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData.data converts NaN to 0");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html
index 3b17b93eaa7..a6f0c977a69 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData objects have the right properties");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js
index 38139cf2419..f8241ceddad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData objects have the right properties");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ 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'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html
index 9bf9ccb4fa9..c56be5bbb3c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData objects properties are read-only");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js
index df4379fe533..2bb6d1f1337 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData objects properties are read-only");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html
index cec6ed4aa11..3901fac7f9a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData.data rounds numbers with round-to-zero");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -45,7 +49,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js
index 845e32d0bdc..1f76abb119f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData.data rounds numbers with round-to-zero");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -41,7 +45,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html
index 948586400bf..aad77df15a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData.data can be modified");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js
index e191464c66f..8eb54381243 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData.data can be modified");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html
index 56fae70d442..a85028750ed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData.data converts strings to numbers with ToNumber");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js
index 933be0fd2d6..de8b2128e9a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData.data converts strings to numbers with ToNumber");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ _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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html
index e003c455d5d..65858e6dd30 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("ImageData.data converts undefined to 0");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js
index 313c5437fcb..faf8b45725c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("ImageData.data converts undefined to 0");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ 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");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.html
index 8c980d63b93..d7771dbefe5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() puts non-solid image data correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.worker.js
index fbfcf0b31ce..1ad7f6247a8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() puts non-solid image data correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.html
index 49dc91805da..fc31f89a022 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() puts image data from getImageData() onto the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.worker.js
index b83df3cc03a..c208df980c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() puts image data from getImageData() onto the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.html
index 053587101c2..ab43db0dae9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() is not affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.clip();
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.worker.js
index 99ab50e98be..bb66970d1ff 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() is not affected by clipping regions");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.clip();
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.html
index 4c11fc5e203..e701423ab3e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() puts image data from createImageData() onto the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.worker.js
index 3bc71e9bddb..8dd7094a127 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.created.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() puts image data from createImageData() onto the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.html
index ca155d3f64c..e99e9781ef0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() accepts image data got from a different canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.worker.js
index b3e5b5a1e7f..39dc92dbb40 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.cross.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() accepts image data got from a different canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.html
index 6617ec41f14..762f4ba563e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() handles negative-sized dirty rectangles correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
index 3e0b4705d57..cb9e4021e61 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() handles negative-sized dirty rectangles correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.html
index 29c10946bdd..a1c45b95fff 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() handles dirty rectangles outside the canvas correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixelApprox(offscreenCanvas, 98,45, 0,255,0,255, "98,45", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
index aaa5e1cab46..87ce21b42cf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() handles dirty rectangles outside the canvas correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixelApprox(offscreenCanvas, 98,45, 0,255,0,255, "98,45", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.html
index eec2d5c8a5c..f5f93f5c6fd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() only modifies areas inside the dirty rectangle, using width and height");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
index 6ee061c2c17..14ca485d4a1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() only modifies areas inside the dirty rectangle, using width and height");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.html
index a26130a13e1..1fe72b887cd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() only modifies areas inside the dirty rectangle, using x and y");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
index 7111049a7d0..dc8f07dd5bd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() only modifies areas inside the dirty rectangle, using x and y");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255",
 _assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.html
index 9ee0b491c3a..9c0ecc59107 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() with zero-sized dirty rectangle puts nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js
index 98278b12a2c..f4a639a15fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() with zero-sized dirty rectangle puts nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.html
index ff06185ce4d..1b070be0735 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() puts modified image data correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
 }
 ctx.putImageData(imgdata, 45, 20);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.worker.js
index ef522744992..e8144220d16 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.modified.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() puts modified image data correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
 }
 ctx.putImageData(imgdata, 45, 20);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.html
index 75ac0591b90..9519691b991 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.html
@@ -11,6 +11,10 @@
 
 <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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -99,7 +103,6 @@ assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, Infinity); });
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, Infinity); });
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, Infinity); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
index 81658080747..97b81d71eac 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 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() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -95,7 +99,6 @@ assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, Infinity); });
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, Infinity); });
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, Infinity); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.html
index 067b5c297e5..f36f93eeddd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("putImageData() with null imagedata throws TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.putImageData(null, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.worker.js
index b558aaab571..e7c4b3bc011 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.null.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() with null imagedata throws TypeError");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 assert_throws(new TypeError(), function() { ctx.putImageData(null, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.html
index 62c5047ff51..16357678a7f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.putImageData(imgdata, 0, 0);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.worker.js
index da5d7700b75..07d3a8a7fec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.putImageData(imgdata, 0, 0);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.html
index b9c269d43e0..6a3170ddb8b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() is not affected by context state");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.translate(100, 50);
 ctx.scale(0.1, 0.1);
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.worker.js
index 15a6ff1e577..e714f418386 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() is not affected by context state");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.translate(100, 50);
 ctx.scale(0.1, 0.1);
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html
index 86d943f9d13..2d085425506 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData(getImageData(...), ...) has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ 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)+"\"]");
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js
index 091593f6aba..0af905832e6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData(getImageData(...), ...) has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ 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)+"\"]");
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.html b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.html
index 7d726fb48c6..90700552371 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("putImageData() does not accept non-ImageData objects");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 0, 0); });
 assert_throws(new TypeError(), function() { ctx.putImageData("cheese", 0, 0); });
 assert_throws(new TypeError(), function() { ctx.putImageData(42, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.worker.js
index 001a9e719fa..93dc33c0795 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/pixel-manipulation/2d.imageData.put.wrongtype.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("putImageData() does not accept non-ImageData objects");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
 assert_throws(new TypeError(), function() { ctx.putImageData(imgdata, 0, 0); });
 assert_throws(new TypeError(), function() { ctx.putImageData("cheese", 0, 0); });
 assert_throws(new TypeError(), function() { ctx.putImageData(42, 0, 0); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.html
index fdfaf7568d4..4a896934b25 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadow colour alpha components are used");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowColor = 'rgba(255, 0, 0, 0.01)';
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.worker.js
index 6ddf9a0d248..6db743255fa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadow colour alpha components are used");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.shadowColor = 'rgba(255, 0, 0, 0.01)';
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.html
index 524f59a7e3d..7df0eb5412b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadow colour alpha components are used");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowColor = 'rgba(0, 0, 255, 0.5)';
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.worker.js
index e671c1a095b..47c5cb935f4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadow colour alpha components are used");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.shadowColor = 'rgba(0, 0, 255, 0.5)';
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.html
index 5a089b9b71a..2d909f6eba6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetY = 50;
 ctx.globalAlpha = 0.5;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.worker.js
index 25c8c5acf00..bbba5e7542d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetY = 50;
 ctx.globalAlpha = 0.5;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.html
index a8c644adf60..6e380817ac8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows with alpha components are correctly affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetY = 50;
 ctx.globalAlpha = 0.707;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.worker.js
index 567b6b884fd..838fb5bf2c0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.4.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows with alpha components are correctly affected by globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetY = 50;
 ctx.globalAlpha = 0.707;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.html
index 2efd35676d3..e465d3dafd2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows of shapes with alpha components are drawn correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.shadowColor = '#00f';
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.worker.js
index 3ebaab64f1a..747aba71127 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.alpha.5.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows of shapes with alpha components are drawn correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.shadowColor = '#00f';
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html
index b7169679bb1..a16f99f4bac 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js
index d5695c85bb2..5a643234347 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html
index 4b2115da3b4..10cf971f742 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertSame(ctx.shadowBlur, 1, "ctx.shadowBlur", "1");
 ctx.shadowBlur = 1;
 ctx.shadowBlur = NaN;
 _assertSame(ctx.shadowBlur, 1, "ctx.shadowBlur", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js
index 87362f099b4..f094774e119 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.shadowBlur, 1, "ctx.shadowBlur", "1");
 ctx.shadowBlur = 1;
 ctx.shadowBlur = NaN;
 _assertSame(ctx.shadowBlur, 1, "ctx.shadowBlur", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.html
index c00765791a9..df387763c38 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowBlur = 1e6;
 _assertSame(ctx.shadowBlur, 1e6, "ctx.shadowBlur", "1e6");
 ctx.shadowBlur = 0;
 _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js
index 71fc28b72f9..63e9099db76 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowBlur = 1e6;
 _assertSame(ctx.shadowBlur, 1e6, "ctx.shadowBlur", "1e6");
 ctx.shadowBlur = 0;
 _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html
index f92379933d1..1bfc3e5c670 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js
index b7d9257a946..bfeaac01164 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html
index 704f07c91e8..c429eeebdb9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
 ctx.shadowColor = '#00ff00';
 ctx.shadowColor = undefined;
 _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js
index a7083941aa8..d11e0fb92e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
 ctx.shadowColor = '#00ff00';
 ctx.shadowColor = undefined;
 _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html
index 22c9f192a59..e892f4b0bc5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowColor = 'lime';
 _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
 ctx.shadowColor = 'RGBA(0,255, 0,0)';
 _assertSame(ctx.shadowColor, 'rgba(0, 255, 0, 0)', "ctx.shadowColor", "'rgba(0, 255, 0, 0)'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js
index 16cf774ba03..4b664467745 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ ctx.shadowColor = 'lime';
 _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
 ctx.shadowColor = 'RGBA(0,255, 0,0)';
 _assertSame(ctx.shadowColor, 'rgba(0, 255, 0, 0)', "ctx.shadowColor", "'rgba(0, 255, 0, 0)'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html
index a844604b5c8..43b269ad35d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0");
 _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js
index 978b234c6f0..d31cba4fdc1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0");
 _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html
index 2599d797aa1..1766fe0a02c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ ctx.shadowOffsetX = NaN;
 ctx.shadowOffsetY = NaN;
 _assertSame(ctx.shadowOffsetX, 1, "ctx.shadowOffsetX", "1");
 _assertSame(ctx.shadowOffsetY, 2, "ctx.shadowOffsetY", "2");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js
index 3fd10ef1b7d..42e51a2c5bc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.shadowOffsetX = NaN;
 ctx.shadowOffsetY = NaN;
 _assertSame(ctx.shadowOffsetX, 1, "ctx.shadowOffsetX", "1");
 _assertSame(ctx.shadowOffsetY, 2, "ctx.shadowOffsetY", "2");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.html
index fde6e64a7b4..258f0486d7f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -36,7 +40,6 @@ ctx.shadowOffsetX = 1e6;
 ctx.shadowOffsetY = 1e6;
 _assertSame(ctx.shadowOffsetX, 1e6, "ctx.shadowOffsetX", "1e6");
 _assertSame(ctx.shadowOffsetY, 1e6, "ctx.shadowOffsetY", "1e6");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js
index 0956222c4e1..ceb0c27e65d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.shadowOffsetX = 1e6;
 ctx.shadowOffsetY = 1e6;
 _assertSame(ctx.shadowOffsetX, 1e6, "ctx.shadowOffsetX", "1e6");
 _assertSame(ctx.shadowOffsetY, 1e6, "ctx.shadowOffsetY", "1e6");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.html
index 7e77dff26ce..68a46f3c85b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn correctly for partially-transparent canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.shadowOffsetY = 50;
 ctx.shadowColor = '#00f';
 ctx.drawImage(offscreenCanvas2, 0, -50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.worker.js
index 00a914800b7..9d2e21e52d9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn correctly for partially-transparent canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowOffsetY = 50;
 ctx.shadowColor = '#00f';
 ctx.drawImage(offscreenCanvas2, 0, -50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.html
index 25ff73d6412..d60bfe9f8e5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.shadowColor = '#0f0';
 ctx.shadowOffsetY = 50;
 ctx.drawImage(offscreenCanvas2, 0, -50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.worker.js
index 46aab07b92a..8e3577420b5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowColor = '#0f0';
 ctx.shadowOffsetY = 50;
 ctx.drawImage(offscreenCanvas2, 0, -50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.html
index df6590c8e19..edabf990ea5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowColor = '#f00';
 ctx.shadowOffsetY = 50;
 ctx.drawImage(offscreenCanvas2, 0, -50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.worker.js
index 6a631f330a6..fa5812f16c3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowColor = '#f00';
 ctx.shadowOffsetY = 50;
 ctx.drawImage(offscreenCanvas2, 0, -50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.html
index 6f4a8f9909f..2612bdcb74d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent parts of canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.drawImage(offscreenCanvas2, -50, -50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.worker.js
index a9c9a7ac9cc..c810e47581f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.canvas.transparent.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent parts of canvases");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.drawImage(offscreenCanvas2, -50, -50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.html
index d452c06ab70..cbc2670a2b2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows of clipped shapes are still drawn within the clipping region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.fillRect(0, 0, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.worker.js
index 27cb869d2ba..722194f6dcd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows of clipped shapes are still drawn within the clipping region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.html
index dc2992cf230..9da2ce47263 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn outside the clipping region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.fillRect(0, 0, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.worker.js
index 8ea9e97bd78..765dc6c1ee8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn outside the clipping region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.html
index 182b93a1721..07c1fc06803 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows of clipped shapes are still drawn within the clipping region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.fillRect(-50, 0, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.worker.js
index 01be0657ff2..3d92d2aaf2f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.clip.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows of clipped shapes are still drawn within the clipping region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.fillRect(-50, 0, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.html
index a80ebbdb051..3a29be8cda0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn using globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetX = 100;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, 0, 200, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.worker.js
index f8c80dcd242..b4644506cca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn using globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetX = 100;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, 0, 200, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.html
index d8def5cd7ee..67bb9d05666 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn using globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowBlur = 1;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-10, -10, 120, 70);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.worker.js
index 2b93baeff70..7c1a408a2e9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn using globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowBlur = 1;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-10, -10, 120, 70);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.html
index d3c68b50374..f9372926dcf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Areas outside shadows are drawn correctly with destination-out");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(200, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.worker.js
index 75a5d2745d9..a4a6ab95054 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.composite.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Areas outside shadows are drawn correctly with destination-out");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(200, 0, 100, 50);
 _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
 _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.html
index 23a6be1aee2..c55c19ed7a9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn if shadowBlur is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowBlur = 0.1;
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.worker.js
index dc2563ff1f6..d150182127d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.blur.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn if shadowBlur is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.shadowBlur = 0.1;
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.html
index b35cd5f1c85..f9a284dd9b9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn when only shadowColor is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowColor = '#f00';
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.worker.js
index 878c7da3c3d..863f1c682da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn when only shadowColor is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ ctx.shadowColor = '#f00';
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.html
index 2825d935236..924fced9a02 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn when only shadowColor is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.shadowColor = '#f00';
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.worker.js
index 9648af5fdbc..cb10f522c62 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.off.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn when only shadowColor is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.shadowColor = '#f00';
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.html
index a0506f4096b..d34a2cbdc4c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn if shadowOffsetX is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowOffsetX = 0.1;
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.worker.js
index f4912bfd3c5..c419cabbc00 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.x.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn if shadowOffsetX is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.shadowOffsetX = 0.1;
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.html
index 2330635e0cf..8d7b2671855 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn if shadowOffsetY is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowOffsetY = 0.1;
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.worker.js
index a695b8e6dcb..6117d996da9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.enable.y.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn if shadowOffsetY is set");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.shadowOffsetY = 0.1;
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.html
index 933de201443..0be3781ecab 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn correctly for partially-transparent gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.shadowColor = '#00f';
 ctx.fillStyle = gradient;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.worker.js
index 9e8fb64260e..637cc92069f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn correctly for partially-transparent gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowColor = '#00f';
 ctx.fillStyle = gradient;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.html
index 5fa70319f7c..f56ce6c23bc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.shadowOffsetY = 50;
 ctx.fillStyle = gradient;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.worker.js
index 9c28e57bb55..800fc315356 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowOffsetY = 50;
 ctx.fillStyle = gradient;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.html
index 55d362164ad..6e79a641648 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.shadowOffsetY = 50;
 ctx.fillStyle = gradient;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.worker.js
index 3f5addc7d6f..0f0fab85e5b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.shadowOffsetY = 50;
 ctx.fillStyle = gradient;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.html
index f15bb989e99..5e7d40db121 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent parts of gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.worker.js
index e5785b8019b..606e852a1f3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.gradient.transparent.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent parts of gradient fills");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.fillRect(0, -50, 100, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.html
index 401df16afd1..205e32de01c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn correctly for partially-transparent images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, -50);
     _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js
index 54ffd70218b..b40be65f5cd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn correctly for partially-transparent images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, -50);
     _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.html
index 47a8fee6e15..9f16324a861 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, -50);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js
index 0f192f9a3df..e55f2d64c47 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, -50);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.html
index b2c02122f7e..a1197f21828 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn correctly for scaled images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js
index 2b430a02b89..e1d6198f344 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn correctly for scaled images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,9 +34,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.html
index 3efd2aadfc5..b3f9ab17f04 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for areas outside image source rectangles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.worker.js
index 73f76e50fb9..a278f4666dc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.section.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for areas outside image source rectangles");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,9 +34,7 @@ promise.then(function(response) {
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html
index 18972fdfb0c..05c125a376f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,9 +36,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, -50);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js
index 465e78ca800..599140ec83a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,9 +32,7 @@ var promise = new Promise(function(resolve, reject) {
 promise.then(function(response) {
     ctx.drawImage(response, 0, -50);
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html
index 0ddf21c0804..32fa486b3f4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent parts of images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,9 +42,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js
index d64e765eeb0..5b8862c0c8a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent parts of images");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.html
index 33a675d8890..78728e0a470 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows can be offset with negative x");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetX = -50;
 ctx.fillRect(50, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.worker.js
index 0135a7e807d..b0679a6014e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeX.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows can be offset with negative x");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetX = -50;
 ctx.fillRect(50, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.html
index 3f7063cad8f..5123af872f4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows can be offset with negative y");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetY = -25;
 ctx.fillRect(0, 25, 100, 25);
 _assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.worker.js
index f2553c5d96b..d5dd5b6f1f2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.negativeY.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows can be offset with negative y");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetY = -25;
 ctx.fillRect(0, 25, 100, 25);
 _assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.html
index 05ff73cdcc9..276c10d8de9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows can be offset with positive x");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetX = 50;
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.worker.js
index 0b6fabd7b6f..d4c4130a92c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveX.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows can be offset with positive x");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetX = 50;
 ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.html
index d5857a50b3a..53ae2ea553f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows can be offset with positive y");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.shadowOffsetY = 25;
 ctx.fillRect(0, 0, 100, 25);
 _assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.worker.js
index dce9816c61d..086d7ceb7d7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.offset.positiveY.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows can be offset with positive y");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.shadowOffsetY = 25;
 ctx.fillRect(0, 0, 100, 25);
 _assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.html
index 776cbeed421..f9ca6b49ef6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows of shapes outside the visible area can be offset onto the visible area");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 12,25, 0,255,0,255, "12,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 87,25, 0,255,0,255, "87,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.worker.js
index 9c389fccf04..f4c7c5bad8f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.outside.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows of shapes outside the visible area can be offset onto the visible area");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 12,25, 0,255,0,255, "12,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 87,25, 0,255,0,255, "87,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html
index 6af064409e1..3e55eb40003 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn correctly for partially-transparent fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.shadowColor = '#00f';
     ctx.fillStyle = pattern;
     ctx.fillRect(0, -50, 100, 50);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js
index b911bd756b0..fc6fdbeb03e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.alpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn correctly for partially-transparent fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.shadowColor = '#00f';
     ctx.fillStyle = pattern;
     ctx.fillRect(0, -50, 100, 50);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.html
index ad7fedc386c..d70f2fce6b3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.shadowOffsetY = 50;
     ctx.fillStyle = pattern;
     ctx.fillRect(0, -50, 100, 50);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js
index 4166c283d0d..5c2a7c97f94 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.shadowOffsetY = 50;
     ctx.fillStyle = pattern;
     ctx.fillRect(0, -50, 100, 50);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html
index 348c79b1b33..29103ad6214 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,9 +37,7 @@ promise.then(function(response) {
     ctx.shadowOffsetY = 50;
     ctx.fillStyle = pattern;
     ctx.fillRect(0, -50, 100, 50);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js
index 2ca00dcacbb..bf8781b3eda 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,9 +33,7 @@ promise.then(function(response) {
     ctx.shadowOffsetY = 50;
     ctx.fillStyle = pattern;
     ctx.fillRect(0, -50, 100, 50);
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html
index 2cc6a44bfdd..6509bae1f55 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for transparent parts of fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -38,9 +42,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js
index b0255facb2e..8a2b7165e78 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.pattern.transparent.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for transparent parts of fill patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,9 +38,7 @@ promise.then(function(response) {
     _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
     _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-});
-
-t.done();
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.html
index 6d71ea25e75..5163682af24 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for strokes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.worker.js
index 72f0f7b991c..d1e59f9b002 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for strokes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.html
index 7a9995d833e..c7b08aefd85 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for areas outside stroke caps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.worker.js
index 74b1b94f91a..e2b67c384e8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for areas outside stroke caps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.html
index 4ff35648b02..7d94d3ebc79 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for stroke caps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.worker.js
index ac25dd8cb35..68dfd0aef89 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.cap.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for stroke caps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.stroke();
 _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.html
index 3647a5d4c3a..6043d04e5c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are not drawn for areas outside stroke joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.worker.js
index 65816df7e60..3aeb1239da8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are not drawn for areas outside stroke joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.html
index 70c96ced4c1..037c2c793e8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for stroke joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -34,7 +38,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.worker.js
index bdcfd09d80c..32e1d3c2c48 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for stroke joins");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.html
index 93075330364..7c20a5f87d6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows are drawn for stroke joins respecting miter limit");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.worker.js
index a769515d7bf..0a902fa2af9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.stroke.join.3.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows are drawn for stroke joins respecting miter limit");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
 _assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255");
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.html
index 09809ccb201..1d677acf3d1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadows take account of transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.shadowColor = '#0f0';
 ctx.translate(100, 100);
 ctx.fillRect(-100, -150, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.worker.js
index 928f53791d9..8f8d23de3d3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.1.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadows take account of transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.shadowColor = '#0f0';
 ctx.translate(100, 100);
 ctx.fillRect(-100, -150, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.html b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.html
index fb5c3225fca..a693521ea95 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Shadow offsets are not affected by transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.shadowColor = '#0f0';
 ctx.rotate(Math.PI)
 ctx.fillRect(-100, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.worker.js
index 9cbd71de5f8..2f1c8864a0b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/shadows/2d.shadow.transform.2.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Shadow offsets are not affected by transformations");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.shadowColor = '#0f0';
 ctx.rotate(Math.PI)
 ctx.fillRect(-100, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.html
index fc1dcd7adf3..5eb9c7eab19 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.worker.js
index bd0256d5171..9338a606386 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.html
index f1ca61b6b71..a3d78d8de29 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
 ctx.textAlign = 'start';
 ctx.textAlign = 'end\0';
 _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.worker.js
index c528e43524b..66ce7aea15f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
 ctx.textAlign = 'start';
 ctx.textAlign = 'end\0';
 _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.html
index d617ce0ff6e..c3f24ecbc45 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ _assertSame(ctx.textAlign, 'right', "ctx.textAlign", "'right'");
 
 ctx.textAlign = 'center';
 _assertSame(ctx.textAlign, 'center', "ctx.textAlign", "'center'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.worker.js
index cdef885dcfe..569cb91e931 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.align.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ _assertSame(ctx.textAlign, 'right', "ctx.textAlign", "'right'");
 
 ctx.textAlign = 'center';
 _assertSame(ctx.textAlign, 'center', "ctx.textAlign", "'center'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.html
index a47f5c56524..ef0ae20d100 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.textBaseline, 'alphabetic', "ctx.textBaseline", "'alphabetic'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.worker.js
index 8bd65af372e..6d76b34f365 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.textBaseline, 'alphabetic', "ctx.textBaseline", "'alphabetic'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.html
index 8e4508fd834..908a9df4031 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ _assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
 ctx.textBaseline = 'top';
 ctx.textBaseline = 'middle\0';
 _assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.worker.js
index 82a190360d6..805abcc0934 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ _assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
 ctx.textBaseline = 'top';
 ctx.textBaseline = 'middle\0';
 _assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.html
index c9d3bffbea2..b672d41f4cf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ _assertSame(ctx.textBaseline, 'ideographic', "ctx.textBaseline", "'ideographic'"
 
 ctx.textBaseline = 'bottom';
 _assertSame(ctx.textBaseline, 'bottom', "ctx.textBaseline", "'bottom'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.worker.js
index 2297133e7d8..35da35b4ee9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.baseline.valid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ _assertSame(ctx.textBaseline, 'ideographic', "ctx.textBaseline", "'ideographic'"
 
 ctx.textBaseline = 'bottom';
 _assertSame(ctx.textBaseline, 'bottom', "ctx.textBaseline", "'bottom'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.html
index c89105373ba..c299cccb118 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign center is the center of the em squares (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.worker.js
index a548b43afac..021947bd246 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.center.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign center is the center of the em squares (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.html
index 342276420ca..f7fcb36126d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign end with ltr is the right edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js
index fb25821f2f9..1e529be23d7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.ltr.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign end with ltr is the right edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.html
index a759cf717c9..016e1f8913f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign end with rtl is the left edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js
index 041fae76b25..f50987c929d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.end.rtl.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign end with rtl is the left edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.html
index a46d76b0b21..d83bf0a7378 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign left is the left of the first em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.worker.js
index c474bf10409..02e689a9d7c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.left.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign left is the left of the first em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.html
index 976256e98e0..9f752e63191 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign right is the right of the last em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.worker.js
index fc01a85b110..170661d84a0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.right.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign right is the right of the last em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.html
index 8f2cc090d0f..33c3141b62d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign start with ltr is the left edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js
index 5664436dfb6..5a3423ce8cb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.ltr.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign start with ltr is the left edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.html
index 6e4206e5deb..ba48f70e4b9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textAlign start with rtl is the right edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js
index 3ea6fe9db2a..4c635cf40e5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.align.start.rtl.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textAlign start with rtl is the right edge");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html
index f95bcd40029..f0957ee8e3f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js
index 8b973e5a2dd..4c18c8fa777 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.alphabetic.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.html
index 0c777883439..20447edafb7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textBaseline bottom is the bottom of the em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js
index 3ae948c1056..851ec749d49 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.bottom.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textBaseline bottom is the bottom of the em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.html
index 46a40c9ba1e..f3a7784adbf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js
index a3fcc35f7bb..94b9678958b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.hanging.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html
index 3f093417618..d6ce08d7a21 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js
index 5cb8eb0cdda..e8b1f49a528 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.ideographic.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.html
index f0407921221..6d17bf33cbb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textBaseline middle is the middle of the em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js
index 0c292040a9e..ebf012edefe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.middle.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textBaseline middle is the middle of the em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.html
index 902ed1b3aa6..9df9206e22b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("textBaseline top is the top of the em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -30,9 +34,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js
index a2427ed54e7..9fa14e6f291 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.baseline.top.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("textBaseline top is the top of the em square (not the bounding box)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.html
index 9ca033ee635..b83d8ede85e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText draws filled text");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#0f0';
 ctx.strokeStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('PASS', 5, 35);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.worker.js
index d86348814c0..2319b5c3922 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.basic-manual.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText draws filled text");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#0f0';
 ctx.strokeStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('PASS', 5, 35);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.html
index 3c7ddaaa418..1ef095dcf1b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', 5, 35, NaN);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.worker.js
index 4e67325b005..7191fa963c3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.NaN.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', 5, 35, NaN);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html
index ae4b308f210..bd941cbbbf5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("fillText handles maxWidth based on line size, not bounding box size");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -27,9 +31,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js
index 08133467076..8482b2623db 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.bound.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText handles maxWidth based on line size, not bounding box size");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -23,9 +27,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html
index b7d4cd63d4e..bc85c45fc94 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("fillText works on @font-face fonts");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#f00';
@@ -27,9 +31,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js
index 6e76ff6fd29..2d205a92fc7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.fontface.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText works on @font-face fonts");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#f00';
@@ -23,9 +27,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.html
index 669df5dafe2..a5b88726572 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('PASS', 5, 35, 200);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.worker.js
index 1eac1933079..3450446a115 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.large-manual.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('PASS', 5, 35, 200);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.html
index fbe920c87c8..2939a95bef1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', 5, 35, -1);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.worker.js
index fec72292ccf..a7a89fe8669 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', 5, 35, -1);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.html
index 00995e75465..319a0cc84e7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', -100, 35, 90);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.worker.js
index fcb09250f5f..6f10788535e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.small.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', -100, 35, 90);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.html
index 2dd17d790f2..bf9b0f24951 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', 5, 35, 0);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.worker.js
index 442a921192c..e52944e955a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.maxWidth.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText handles maxWidth correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('fail fail fail fail fail', 5, 35, 0);
 _assertGreen(ctx, 100, 50);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.html
index ddbd1ffb758..f80a891c2f2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText respects Right-To-Left Override characters");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillStyle = '#0f0';
 ctx.strokeStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('\u202eFAIL \xa0 \xa0 SSAP', 5, 35);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.worker.js
index c7be4f826ec..3422e835a64 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.rtl-manual.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText respects Right-To-Left Override characters");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillStyle = '#0f0';
 ctx.strokeStyle = '#f00';
 ctx.font = '35px Arial, sans-serif';
 ctx.fillText('\u202eFAIL \xa0 \xa0 SSAP', 5, 35);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.html
index 7c46db0f692..e7e71727f7f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("fillText does not start a new path or subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ ctx.fill();
 
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.worker.js
index bfd182e8b4a..e90aa3b9f79 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fill.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("fillText does not start a new path or subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ ctx.fill();
 
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.html
index 77994dae535..099074fa70c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '67px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -27,9 +31,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html
index d2bff84de5d..df319696e2a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("@font-face fonts should work even if they are not used in the page");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '67px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -27,9 +31,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js
index bfc6a74dba1..d8d5aa1c2a0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.notinpage.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("@font-face fonts should work even if they are not used in the page");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '67px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -23,9 +27,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.html
index b2a846b6151..9bf37b80aed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,16 +25,14 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.font = '67px CanvasTest';
 ctx.fillStyle = '#0f0';
 ctx.fillText('AA', 0, 50);
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillText('AA', 0, 50);
     _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js
index 5e16af79507..5fdc5af4b71 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,16 +21,14 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.font = '67px CanvasTest';
 ctx.fillStyle = '#0f0';
 ctx.fillText('AA', 0, 50);
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillText('AA', 0, 50);
     _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.worker.js
index ed9e36ae86a..115cbf2d11b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.fontface.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '67px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -23,9 +27,7 @@ step_timeout(t.step_func_done(function () {
     _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.html
index 372e6138573..e6c209a99b1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Stroked and filled text should have exactly the same kerning so it overlaps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillText('VAVAVAVAVAVAVA', -50, 25);
 ctx.fillText('ToToToToToToTo', -50, 45);
 ctx.strokeText('VAVAVAVAVAVAVA', -50, 25);
 ctx.strokeText('ToToToToToToTo', -50, 45);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.worker.js
index 8bdb213a12b..f7f04765d09 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.kern.consistent-manual.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Stroked and filled text should have exactly the same kerning so it overlaps");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillText('VAVAVAVAVAVAVA', -50, 25);
 ctx.fillText('ToToToToToToTo', -50, 45);
 ctx.strokeText('VAVAVAVAVAVAVA', -50, 25);
 ctx.strokeText('ToToToToToToTo', -50, 45);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.html
index 8d3ecedf94e..24cc42d6138 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.html
@@ -11,23 +11,25 @@
 
 <script>
 var t = async_test("U+0020 is rendered the correct size (1em wide)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E EE', -100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.worker.js
index 1a6c231f2bc..48b37e93a9c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.basic.worker.js
@@ -7,23 +7,25 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("U+0020 is rendered the correct size (1em wide)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E EE', -100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.html
index 1b84bf0893b..488c5ebe259 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.html
@@ -11,14 +11,18 @@
 
 <script>
 var t = async_test("Space characters at the end of a line are collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -26,9 +30,7 @@ step_timeout(t.step_func_done(function () {
     ctx.fillText('EE ', 100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js
index 58189f3a771..1ba48cf32c5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.end.worker.js
@@ -7,14 +7,18 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Space characters at the end of a line are collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
@@ -22,9 +26,7 @@ step_timeout(t.step_func_done(function () {
     ctx.fillText('EE ', 100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html
index 5e01afbf59d..5adc6ce7bc0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.html
@@ -11,23 +11,25 @@
 
 <script>
 var t = async_test("Non-space characters are not converted to U+0020 and collapsed");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E\x0b EE', -150, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js
index 63e98d4ac82..5c5ddd9d69c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.nonspace.worker.js
@@ -7,23 +7,25 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Non-space characters are not converted to U+0020 and collapsed");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E\x0b EE', -150, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.html
index 4962f3bc86c..38baee129b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.html
@@ -11,23 +11,25 @@
 
 <script>
 var t = async_test("Space characters are converted to U+0020, and collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dEE', -100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js
index 66fe2e76712..1b687c7bf49 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.other.worker.js
@@ -7,23 +7,25 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Space characters are converted to U+0020, and collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dEE', -100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.html
index a2f788bd64d..7f775a950ea 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.html
@@ -11,23 +11,25 @@
 
 <script>
 var t = async_test("Space characters are converted to U+0020, and collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E  EE', -100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js
index 8b002f52955..f4df16c2897 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.space.worker.js
@@ -7,23 +7,25 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Space characters are converted to U+0020, and collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText('E  EE', -100, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.html
index 806abc861b8..ef20d357d5c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.html
@@ -11,23 +11,25 @@
 
 <script>
 var t = async_test("Space characters at the start of a line are collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText(' EE', 0, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js
index 076d7e4c577..549fab0b46e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.space.collapse.start.worker.js
@@ -7,23 +7,25 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Space characters at the start of a line are collapsed (per CSS)");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '50px CanvasTest';
-deferTest();
-step_timeout(t.step_func_done(function () {
+new Promise(function(resolve) { step_timeout(resolve, 500); })
+  .then(function() {
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
     ctx.fillText(' EE', 0, 37.5);
     _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
     _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-}), 500);
-
-t.done();
+  }).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.html
index 510b385b2c9..73120bd4226 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeText draws stroked text");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillStyle = '#f00';
 ctx.lineWidth = 1;
 ctx.font = '35px Arial, sans-serif';
 ctx.strokeText('PASS', 5, 35);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.worker.js
index 680cf3b18b6..4da0b5dca35 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.basic-manual.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeText draws stroked text");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillStyle = '#f00';
 ctx.lineWidth = 1;
 ctx.font = '35px Arial, sans-serif';
 ctx.strokeText('PASS', 5, 35);
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.html
index e64415496f7..b0c755469f9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("strokeText does not start a new path or subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -33,7 +37,6 @@ ctx.fill();
 
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.worker.js
index 90e0feb0ed5..87236552eb1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.draw.stroke.unaffected.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("strokeText does not start a new path or subpath");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.fill();
 
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.html
index 19a89d00704..800c7c98c76 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.worker.js
index 94ab1be533a..138670ee443 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.default.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.html
index 4c61e6e4d21..68685e18b58 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 
 ctx.font = '20PX   SERIF';
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.worker.js
index 71791441185..e2590dcfa75 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 
 ctx.font = '20PX   SERIF';
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.html
index 34d54196653..cb62da00ea1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = 'small-caps italic 400 12px/2 Unknown Font, sans-serif';
 _assertSame(ctx.font, 'italic small-caps 12px "Unknown Font", sans-serif', "ctx.font", "'italic small-caps 12px \"Unknown Font\", sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.worker.js
index 958af64768b..c094dbacf13 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.complex.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = 'small-caps italic 400 12px/2 Unknown Font, sans-serif';
 _assertSame(ctx.font, 'italic small-caps 12px "Unknown Font", sans-serif', "ctx.font", "'italic small-caps 12px \"Unknown Font\", sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.html
index 79860234a56..b72dec5816a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -50,7 +54,6 @@ _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 ctx.font = '20px serif';
 ctx.font = '1em serif; background: green; margin: 10px';
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.worker.js
index 9be1a6d6a84..3d52837fb5d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.invalid.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -46,7 +50,6 @@ _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 ctx.font = '20px serif';
 ctx.font = '1em serif; background: green; margin: 10px';
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.html
index 49adb4c383a..df7705c1c6c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("System fonts must be computed to explicit values");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = 'message-box';
 _assertDifferent(ctx.font, 'message-box', "ctx.font", "'message-box'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.worker.js
index c05ca6a58fa..bdecbb13ea7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.system.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("System fonts must be computed to explicit values");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = 'message-box';
 _assertDifferent(ctx.font, 'message-box', "ctx.font", "'message-box'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.html
index 0b39dc64036..abb1b1a1581 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '1px sans-serif';
 _assertSame(ctx.font, '1px sans-serif', "ctx.font", "'1px sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.worker.js
index 70c864525fd..be1841b986b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.parse.tiny.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '1px sans-serif';
 _assertSame(ctx.font, '1px sans-serif', "ctx.font", "'1px sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.html
index 8bd0d6385b6..ebe3d2d43e0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '1em sans-serif';
 _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js
index 09d06e6c55d..470c54faaf0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.font.relative_size.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 ctx.font = '1em sans-serif';
 _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.html
index e7809e3f6c1..95b2119d9e3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.html
@@ -11,36 +11,37 @@
 
 <script>
 var t = async_test("Testing actualBoundingBox for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        ctx.baseline = 'alphabetic'
-        // Some platforms may return '-0'.
-        _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxLeft)", "0");
-        // Different platforms may render text slightly different.
-        _assert(ctx.measureText('A').actualBoundingBoxRight >= 50, "ctx.measureText('A').actualBoundingBoxRight >= 50");
-        _assert(ctx.measureText('A').actualBoundingBoxAscent >= 35, "ctx.measureText('A').actualBoundingBoxAscent >= 35");
-        _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxDescent), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxDescent)", "0");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    ctx.baseline = 'alphabetic'
+    // Some platforms may return '-0'.
+    _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxLeft)", "0");
+    // Different platforms may render text slightly different.
+    _assert(ctx.measureText('A').actualBoundingBoxRight >= 50, "ctx.measureText('A').actualBoundingBoxRight >= 50");
+    _assert(ctx.measureText('A').actualBoundingBoxAscent >= 35, "ctx.measureText('A').actualBoundingBoxAscent >= 35");
+    _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxDescent), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxDescent)", "0");
 
-        _assertSame(Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft)", "0");
-        _assert(ctx.measureText('ABCD').actualBoundingBoxRight >= 200, "ctx.measureText('ABCD').actualBoundingBoxRight >= 200");
-        _assert(ctx.measureText('ABCD').actualBoundingBoxAscent >= 85, "ctx.measureText('ABCD').actualBoundingBoxAscent >= 85");
-        _assert(ctx.measureText('ABCD').actualBoundingBoxDescent >= 37, "ctx.measureText('ABCD').actualBoundingBoxDescent >= 37");
-    }), 500);
-});
-
-t.done();
+    _assertSame(Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft)", "0");
+    _assert(ctx.measureText('ABCD').actualBoundingBoxRight >= 200, "ctx.measureText('ABCD').actualBoundingBoxRight >= 200");
+    _assert(ctx.measureText('ABCD').actualBoundingBoxAscent >= 85, "ctx.measureText('ABCD').actualBoundingBoxAscent >= 85");
+    _assert(ctx.measureText('ABCD').actualBoundingBoxDescent >= 37, "ctx.measureText('ABCD').actualBoundingBoxDescent >= 37");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.worker.js
index 0715cdb44be..22a5369a20e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.actualBoundingBox.worker.js
@@ -7,36 +7,37 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Testing actualBoundingBox for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        ctx.baseline = 'alphabetic'
-        // Some platforms may return '-0'.
-        _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxLeft)", "0");
-        // Different platforms may render text slightly different.
-        _assert(ctx.measureText('A').actualBoundingBoxRight >= 50, "ctx.measureText('A').actualBoundingBoxRight >= 50");
-        _assert(ctx.measureText('A').actualBoundingBoxAscent >= 35, "ctx.measureText('A').actualBoundingBoxAscent >= 35");
-        _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxDescent), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxDescent)", "0");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    ctx.baseline = 'alphabetic'
+    // Some platforms may return '-0'.
+    _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxLeft)", "0");
+    // Different platforms may render text slightly different.
+    _assert(ctx.measureText('A').actualBoundingBoxRight >= 50, "ctx.measureText('A').actualBoundingBoxRight >= 50");
+    _assert(ctx.measureText('A').actualBoundingBoxAscent >= 35, "ctx.measureText('A').actualBoundingBoxAscent >= 35");
+    _assertSame(Math.abs(ctx.measureText('A').actualBoundingBoxDescent), 0, "Math.abs(ctx.measureText('A').actualBoundingBoxDescent)", "0");
 
-        _assertSame(Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft)", "0");
-        _assert(ctx.measureText('ABCD').actualBoundingBoxRight >= 200, "ctx.measureText('ABCD').actualBoundingBoxRight >= 200");
-        _assert(ctx.measureText('ABCD').actualBoundingBoxAscent >= 85, "ctx.measureText('ABCD').actualBoundingBoxAscent >= 85");
-        _assert(ctx.measureText('ABCD').actualBoundingBoxDescent >= 37, "ctx.measureText('ABCD').actualBoundingBoxDescent >= 37");
-    }), 500);
-});
-
-t.done();
+    _assertSame(Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft), 0, "Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft)", "0");
+    _assert(ctx.measureText('ABCD').actualBoundingBoxRight >= 200, "ctx.measureText('ABCD').actualBoundingBoxRight >= 200");
+    _assert(ctx.measureText('ABCD').actualBoundingBoxAscent >= 85, "ctx.measureText('ABCD').actualBoundingBoxAscent >= 85");
+    _assert(ctx.measureText('ABCD').actualBoundingBoxDescent >= 37, "ctx.measureText('ABCD').actualBoundingBoxDescent >= 37");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.html
index 40104882154..6f4e21de95a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.html
@@ -11,38 +11,39 @@
 
 <script>
 var t = async_test("Testing width advances for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        // Some platforms may return '-0'.
-        _assertSame(Math.abs(ctx.measureText('Hello').advances[0]), 0, "Math.abs(ctx.measureText('Hello').advances[\""+(0)+"\"])", "0");
-        // Different platforms may render text slightly different.
-        _assert(ctx.measureText('Hello').advances[1] >= 36, "ctx.measureText('Hello').advances[\""+(1)+"\"] >= 36");
-        _assert(ctx.measureText('Hello').advances[2] >= 58, "ctx.measureText('Hello').advances[\""+(2)+"\"] >= 58");
-        _assert(ctx.measureText('Hello').advances[3] >= 70, "ctx.measureText('Hello').advances[\""+(3)+"\"] >= 70");
-        _assert(ctx.measureText('Hello').advances[4] >= 80, "ctx.measureText('Hello').advances[\""+(4)+"\"] >= 80");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    // Some platforms may return '-0'.
+    _assertSame(Math.abs(ctx.measureText('Hello').advances[0]), 0, "Math.abs(ctx.measureText('Hello').advances[\""+(0)+"\"])", "0");
+    // Different platforms may render text slightly different.
+    _assert(ctx.measureText('Hello').advances[1] >= 36, "ctx.measureText('Hello').advances[\""+(1)+"\"] >= 36");
+    _assert(ctx.measureText('Hello').advances[2] >= 58, "ctx.measureText('Hello').advances[\""+(2)+"\"] >= 58");
+    _assert(ctx.measureText('Hello').advances[3] >= 70, "ctx.measureText('Hello').advances[\""+(3)+"\"] >= 70");
+    _assert(ctx.measureText('Hello').advances[4] >= 80, "ctx.measureText('Hello').advances[\""+(4)+"\"] >= 80");
 
-        var tm = ctx.measureText('Hello');
-        _assertSame(ctx.measureText('Hello').advances[0], tm.advances[0], "ctx.measureText('Hello').advances[\""+(0)+"\"]", "tm.advances[\""+(0)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[1], tm.advances[1], "ctx.measureText('Hello').advances[\""+(1)+"\"]", "tm.advances[\""+(1)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[2], tm.advances[2], "ctx.measureText('Hello').advances[\""+(2)+"\"]", "tm.advances[\""+(2)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[3], tm.advances[3], "ctx.measureText('Hello').advances[\""+(3)+"\"]", "tm.advances[\""+(3)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[4], tm.advances[4], "ctx.measureText('Hello').advances[\""+(4)+"\"]", "tm.advances[\""+(4)+"\"]");
-    }), 500);
-});
-
-t.done();
+    var tm = ctx.measureText('Hello');
+    _assertSame(ctx.measureText('Hello').advances[0], tm.advances[0], "ctx.measureText('Hello').advances[\""+(0)+"\"]", "tm.advances[\""+(0)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[1], tm.advances[1], "ctx.measureText('Hello').advances[\""+(1)+"\"]", "tm.advances[\""+(1)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[2], tm.advances[2], "ctx.measureText('Hello').advances[\""+(2)+"\"]", "tm.advances[\""+(2)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[3], tm.advances[3], "ctx.measureText('Hello').advances[\""+(3)+"\"]", "tm.advances[\""+(3)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[4], tm.advances[4], "ctx.measureText('Hello').advances[\""+(4)+"\"]", "tm.advances[\""+(4)+"\"]");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.worker.js
index 575ddec03d9..1a2c66f051f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.advances.worker.js
@@ -7,38 +7,39 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Testing width advances for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        // Some platforms may return '-0'.
-        _assertSame(Math.abs(ctx.measureText('Hello').advances[0]), 0, "Math.abs(ctx.measureText('Hello').advances[\""+(0)+"\"])", "0");
-        // Different platforms may render text slightly different.
-        _assert(ctx.measureText('Hello').advances[1] >= 36, "ctx.measureText('Hello').advances[\""+(1)+"\"] >= 36");
-        _assert(ctx.measureText('Hello').advances[2] >= 58, "ctx.measureText('Hello').advances[\""+(2)+"\"] >= 58");
-        _assert(ctx.measureText('Hello').advances[3] >= 70, "ctx.measureText('Hello').advances[\""+(3)+"\"] >= 70");
-        _assert(ctx.measureText('Hello').advances[4] >= 80, "ctx.measureText('Hello').advances[\""+(4)+"\"] >= 80");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    // Some platforms may return '-0'.
+    _assertSame(Math.abs(ctx.measureText('Hello').advances[0]), 0, "Math.abs(ctx.measureText('Hello').advances[\""+(0)+"\"])", "0");
+    // Different platforms may render text slightly different.
+    _assert(ctx.measureText('Hello').advances[1] >= 36, "ctx.measureText('Hello').advances[\""+(1)+"\"] >= 36");
+    _assert(ctx.measureText('Hello').advances[2] >= 58, "ctx.measureText('Hello').advances[\""+(2)+"\"] >= 58");
+    _assert(ctx.measureText('Hello').advances[3] >= 70, "ctx.measureText('Hello').advances[\""+(3)+"\"] >= 70");
+    _assert(ctx.measureText('Hello').advances[4] >= 80, "ctx.measureText('Hello').advances[\""+(4)+"\"] >= 80");
 
-        var tm = ctx.measureText('Hello');
-        _assertSame(ctx.measureText('Hello').advances[0], tm.advances[0], "ctx.measureText('Hello').advances[\""+(0)+"\"]", "tm.advances[\""+(0)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[1], tm.advances[1], "ctx.measureText('Hello').advances[\""+(1)+"\"]", "tm.advances[\""+(1)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[2], tm.advances[2], "ctx.measureText('Hello').advances[\""+(2)+"\"]", "tm.advances[\""+(2)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[3], tm.advances[3], "ctx.measureText('Hello').advances[\""+(3)+"\"]", "tm.advances[\""+(3)+"\"]");
-        _assertSame(ctx.measureText('Hello').advances[4], tm.advances[4], "ctx.measureText('Hello').advances[\""+(4)+"\"]", "tm.advances[\""+(4)+"\"]");
-    }), 500);
-});
-
-t.done();
+    var tm = ctx.measureText('Hello');
+    _assertSame(ctx.measureText('Hello').advances[0], tm.advances[0], "ctx.measureText('Hello').advances[\""+(0)+"\"]", "tm.advances[\""+(0)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[1], tm.advances[1], "ctx.measureText('Hello').advances[\""+(1)+"\"]", "tm.advances[\""+(1)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[2], tm.advances[2], "ctx.measureText('Hello').advances[\""+(2)+"\"]", "tm.advances[\""+(2)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[3], tm.advances[3], "ctx.measureText('Hello').advances[\""+(3)+"\"]", "tm.advances[\""+(3)+"\"]");
+    _assertSame(ctx.measureText('Hello').advances[4], tm.advances[4], "ctx.measureText('Hello').advances[\""+(4)+"\"]", "tm.advances[\""+(4)+"\"]");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.html
index bdb6d119139..fd26c5cb3d0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.html
@@ -11,31 +11,32 @@
 
 <script>
 var t = async_test("Testing baselines for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        _assertSame(Math.abs(ctx.measureText('A').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('A').getBaselines().alphabetic)", "0");
-        _assertSame(ctx.measureText('A').getBaselines().ideographic, -39, "ctx.measureText('A').getBaselines().ideographic", "-39");
-        _assertSame(ctx.measureText('A').getBaselines().hanging, 68, "ctx.measureText('A').getBaselines().hanging", "68");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+   ctx.font = '50px CanvasTest';
+   ctx.direction = 'ltr';
+   ctx.align = 'left'
+   _assertSame(Math.abs(ctx.measureText('A').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('A').getBaselines().alphabetic)", "0");
+   _assertSame(ctx.measureText('A').getBaselines().ideographic, -39, "ctx.measureText('A').getBaselines().ideographic", "-39");
+   _assertSame(ctx.measureText('A').getBaselines().hanging, 68, "ctx.measureText('A').getBaselines().hanging", "68");
 
-        _assertSame(Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic)", "0");
-        _assertSame(ctx.measureText('ABCD').getBaselines().ideographic, -39, "ctx.measureText('ABCD').getBaselines().ideographic", "-39");
-        _assertSame(ctx.measureText('ABCD').getBaselines().hanging, 68, "ctx.measureText('ABCD').getBaselines().hanging", "68");
-    }), 500);
-});
-
-t.done();
+   _assertSame(Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic)", "0");
+   _assertSame(ctx.measureText('ABCD').getBaselines().ideographic, -39, "ctx.measureText('ABCD').getBaselines().ideographic", "-39");
+   _assertSame(ctx.measureText('ABCD').getBaselines().hanging, 68, "ctx.measureText('ABCD').getBaselines().hanging", "68");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.worker.js
index 04b033e14cd..d1c2dff8c80 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.baselines.worker.js
@@ -7,31 +7,32 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Testing baselines for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        _assertSame(Math.abs(ctx.measureText('A').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('A').getBaselines().alphabetic)", "0");
-        _assertSame(ctx.measureText('A').getBaselines().ideographic, -39, "ctx.measureText('A').getBaselines().ideographic", "-39");
-        _assertSame(ctx.measureText('A').getBaselines().hanging, 68, "ctx.measureText('A').getBaselines().hanging", "68");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+   ctx.font = '50px CanvasTest';
+   ctx.direction = 'ltr';
+   ctx.align = 'left'
+   _assertSame(Math.abs(ctx.measureText('A').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('A').getBaselines().alphabetic)", "0");
+   _assertSame(ctx.measureText('A').getBaselines().ideographic, -39, "ctx.measureText('A').getBaselines().ideographic", "-39");
+   _assertSame(ctx.measureText('A').getBaselines().hanging, 68, "ctx.measureText('A').getBaselines().hanging", "68");
 
-        _assertSame(Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic)", "0");
-        _assertSame(ctx.measureText('ABCD').getBaselines().ideographic, -39, "ctx.measureText('ABCD').getBaselines().ideographic", "-39");
-        _assertSame(ctx.measureText('ABCD').getBaselines().hanging, 68, "ctx.measureText('ABCD').getBaselines().hanging", "68");
-    }), 500);
-});
-
-t.done();
+   _assertSame(Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic), 0, "Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic)", "0");
+   _assertSame(ctx.measureText('ABCD').getBaselines().ideographic, -39, "ctx.measureText('ABCD').getBaselines().ideographic", "-39");
+   _assertSame(ctx.measureText('ABCD').getBaselines().hanging, 68, "ctx.measureText('ABCD').getBaselines().hanging", "68");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.html
index 62258ad713c..a08c2ae7dae 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.html
@@ -11,31 +11,32 @@
 
 <script>
 var t = async_test("Testing emHeights for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
-        _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
-        _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
+    _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
+    _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
 
-        _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
-        _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
-        _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
-    }), 500);
-});
-
-t.done();
+    _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
+    _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
+    _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.worker.js
index 6f073bd3913..bf576f2c4cd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.emHeights.worker.js
@@ -7,31 +7,32 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Testing emHeights for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
-        _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
-        _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
+    _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
+    _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
 
-        _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
-        _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
-        _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
-    }), 500);
-});
-
-t.done();
+    _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
+    _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
+    _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.html
index 6133ec67feb..79027720358 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.html
@@ -11,29 +11,30 @@
 
 <script>
 var t = async_test("Testing fontBoundingBox for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 85, "ctx.measureText('A').fontBoundingBoxAscent", "85");
-        _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 39, "ctx.measureText('A').fontBoundingBoxDescent", "39");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 85, "ctx.measureText('A').fontBoundingBoxAscent", "85");
+    _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 39, "ctx.measureText('A').fontBoundingBoxDescent", "39");
 
-        _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 85, "ctx.measureText('ABCD').fontBoundingBoxAscent", "85");
-        _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 39, "ctx.measureText('ABCD').fontBoundingBoxDescent", "39");
-    }), 500);
-});
-
-t.done();
+    _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 85, "ctx.measureText('ABCD').fontBoundingBoxAscent", "85");
+    _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 39, "ctx.measureText('ABCD').fontBoundingBoxDescent", "39");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.worker.js
index cf64d653b30..018ff33c788 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.fontBoundingBox.worker.js
@@ -7,29 +7,30 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Testing fontBoundingBox for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        ctx.direction = 'ltr';
-        ctx.align = 'left'
-        _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 85, "ctx.measureText('A').fontBoundingBoxAscent", "85");
-        _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 39, "ctx.measureText('A').fontBoundingBoxDescent", "39");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 85, "ctx.measureText('A').fontBoundingBoxAscent", "85");
+    _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 39, "ctx.measureText('A').fontBoundingBoxDescent", "39");
 
-        _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 85, "ctx.measureText('ABCD').fontBoundingBoxAscent", "85");
-        _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 39, "ctx.measureText('ABCD').fontBoundingBoxDescent", "39");
-    }), 500);
-});
-
-t.done();
+    _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 85, "ctx.measureText('ABCD').fontBoundingBoxAscent", "85");
+    _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 39, "ctx.measureText('ABCD').fontBoundingBoxDescent", "39");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.html
index 0adef6c5577..6ace944962a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.html
@@ -11,28 +11,29 @@
 
 <script>
 var t = async_test("The width of character is same as font used for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        _assertSame(ctx.measureText('A').width, 50, "ctx.measureText('A').width", "50");
-        _assertSame(ctx.measureText('AA').width, 100, "ctx.measureText('AA').width", "100");
-        _assertSame(ctx.measureText('ABCD').width, 200, "ctx.measureText('ABCD').width", "200");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    _assertSame(ctx.measureText('A').width, 50, "ctx.measureText('A').width", "50");
+    _assertSame(ctx.measureText('AA').width, 100, "ctx.measureText('AA').width", "100");
+    _assertSame(ctx.measureText('ABCD').width, 200, "ctx.measureText('ABCD').width", "200");
 
-        ctx.font = '100px CanvasTest';
-        _assertSame(ctx.measureText('A').width, 100, "ctx.measureText('A').width", "100");
-    }), 500);
-});
-
-t.done();
+    ctx.font = '100px CanvasTest';
+    _assertSame(ctx.measureText('A').width, 100, "ctx.measureText('A').width", "100");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.worker.js
index fef71b34f4e..da2ea705b4d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.basic.worker.js
@@ -7,28 +7,29 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("The width of character is same as font used for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        _assertSame(ctx.measureText('A').width, 50, "ctx.measureText('A').width", "50");
-        _assertSame(ctx.measureText('AA').width, 100, "ctx.measureText('AA').width", "100");
-        _assertSame(ctx.measureText('ABCD').width, 200, "ctx.measureText('ABCD').width", "200");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    _assertSame(ctx.measureText('A').width, 50, "ctx.measureText('A').width", "50");
+    _assertSame(ctx.measureText('AA').width, 100, "ctx.measureText('AA').width", "100");
+    _assertSame(ctx.measureText('ABCD').width, 200, "ctx.measureText('ABCD').width", "200");
 
-        ctx.font = '100px CanvasTest';
-        _assertSame(ctx.measureText('A').width, 100, "ctx.measureText('A').width", "100");
-    }), 500);
-});
-
-t.done();
+    ctx.font = '100px CanvasTest';
+    _assertSame(ctx.measureText('A').width, 100, "ctx.measureText('A').width", "100");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.html
index 24cd14bb20d..e8c0b544ac4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.html
@@ -11,23 +11,24 @@
 
 <script>
 var t = async_test("The empty string has zero width for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        _assertSame(ctx.measureText("").width, 0, "ctx.measureText(\"\").width", "0");
-    }), 500);
-});
-
-t.done();
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    _assertSame(ctx.measureText("").width, 0, "ctx.measureText(\"\").width", "0");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.worker.js
index cecd8ce5bbf..32f91cda966 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.empty.worker.js
@@ -7,23 +7,24 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("The empty string has zero width for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        _assertSame(ctx.measureText("").width, 0, "ctx.measureText(\"\").width", "0");
-    }), 500);
-});
-
-t.done();
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    _assertSame(ctx.measureText("").width, 0, "ctx.measureText(\"\").width", "0");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.html b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.html
index 0d0fc3cf2d1..30a73cca1a4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.html
@@ -11,29 +11,30 @@
 
 <script>
 var t = async_test("Space characters are converted to U+0020 and collapsed (per CSS) for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        _assertSame(ctx.measureText('A B').width, 150, "ctx.measureText('A B').width", "150");
-        _assertSame(ctx.measureText('A  B').width, 150, "ctx.measureText('A  B').width", "150");
-        _assertSame(ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width, 150, "ctx.measureText('A \\x09\\x0a\\x0c\\x0d  \\x09\\x0a\\x0c\\x0dB').width", "150");
-        _assert(ctx.measureText('A \x0b B').width >= 200, "ctx.measureText('A \\x0b B').width >= 200");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    _assertSame(ctx.measureText('A B').width, 150, "ctx.measureText('A B').width", "150");
+    _assertSame(ctx.measureText('A  B').width, 150, "ctx.measureText('A  B').width", "150");
+    _assertSame(ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width, 150, "ctx.measureText('A \\x09\\x0a\\x0c\\x0d  \\x09\\x0a\\x0c\\x0dB').width", "150");
+    _assert(ctx.measureText('A \x0b B').width >= 200, "ctx.measureText('A \\x0b B').width >= 200");
 
-        _assertSame(ctx.measureText(' AB').width, 100, "ctx.measureText(' AB').width", "100");
-        _assertSame(ctx.measureText('AB ').width, 100, "ctx.measureText('AB ').width", "100");
-    }), 500);
-});
-
-t.done();
+    _assertSame(ctx.measureText(' AB').width, 100, "ctx.measureText(' AB').width", "100");
+    _assertSame(ctx.measureText('AB ').width, 100, "ctx.measureText('AB ').width", "100");
+}).then(t_pass, t_fail);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.worker.js
index ee7e071bddd..60bffaaa767 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/text/2d.text.measure.width.space.worker.js
@@ -7,29 +7,30 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Space characters are converted to U+0020 and collapsed (per CSS) for OffscreenCanvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-deferTest();
 var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
 let fonts = (self.fonts ? self.fonts : document.fonts);
 fonts.add(f);
 fonts.ready.then(() => {
-    step_timeout(t.step_func_done(function () {
-        ctx.font = '50px CanvasTest';
-        _assertSame(ctx.measureText('A B').width, 150, "ctx.measureText('A B').width", "150");
-        _assertSame(ctx.measureText('A  B').width, 150, "ctx.measureText('A  B').width", "150");
-        _assertSame(ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width, 150, "ctx.measureText('A \\x09\\x0a\\x0c\\x0d  \\x09\\x0a\\x0c\\x0dB').width", "150");
-        _assert(ctx.measureText('A \x0b B').width >= 200, "ctx.measureText('A \\x0b B').width >= 200");
+    return new Promise(function(resolve) { step_timeout(resolve, 500); });
+}).then(function() {
+    ctx.font = '50px CanvasTest';
+    _assertSame(ctx.measureText('A B').width, 150, "ctx.measureText('A B').width", "150");
+    _assertSame(ctx.measureText('A  B').width, 150, "ctx.measureText('A  B').width", "150");
+    _assertSame(ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width, 150, "ctx.measureText('A \\x09\\x0a\\x0c\\x0d  \\x09\\x0a\\x0c\\x0dB').width", "150");
+    _assert(ctx.measureText('A \x0b B').width >= 200, "ctx.measureText('A \\x0b B').width >= 200");
 
-        _assertSame(ctx.measureText(' AB').width, 100, "ctx.measureText(' AB').width", "100");
-        _assertSame(ctx.measureText('AB ').width, 100, "ctx.measureText('AB ').width", "100");
-    }), 500);
-});
-
-t.done();
+    _assertSame(ctx.measureText(' AB').width, 100, "ctx.measureText(' AB').width", "100");
+    _assertSame(ctx.measureText('AB ').width, 100, "ctx.measureText('AB ').width", "100");
+}).then(t_pass, t_fail);
 
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.html
index fbc479d4017..b9553872eda 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() does not affect the current bitmap");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.worker.js
index 3c27d46e03a..52722923b5d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.bitmap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() does not affect the current bitmap");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.html
index 7c23f4be83e..386c3c2c898 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() affects the clipping path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.restore();
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.worker.js
index 918199bd341..ced10aca288 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() affects the clipping path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.restore();
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html
index ef10480dc02..1d7e862c23e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for fillStyle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.fillStyle;
 ctx.save();
 _assertSame(ctx.fillStyle, old, "ctx.fillStyle", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js
index 72d324b83aa..4727798e86f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for fillStyle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.fillStyle;
 ctx.save();
 _assertSame(ctx.fillStyle, old, "ctx.fillStyle", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html
index fa0c7d32dbc..ec31c63daa5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.globalAlpha;
 ctx.save();
 _assertSame(ctx.globalAlpha, old, "ctx.globalAlpha", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js
index fc425e88e91..1e04d845a36 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for globalAlpha");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.globalAlpha;
 ctx.save();
 _assertSame(ctx.globalAlpha, old, "ctx.globalAlpha", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html
index 47ef7287610..360905d26b5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.globalCompositeOperation;
 ctx.save();
 _assertSame(ctx.globalCompositeOperation, old, "ctx.globalCompositeOperation", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js
index 04141b96c80..b8a970df738 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for globalCompositeOperation");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.globalCompositeOperation;
 ctx.save();
 _assertSame(ctx.globalCompositeOperation, old, "ctx.globalCompositeOperation", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html
index 708e059aa21..60c2482a41d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for lineCap");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.lineCap;
 ctx.save();
 _assertSame(ctx.lineCap, old, "ctx.lineCap", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js
index c2deb7acdd8..9082b02d69a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for lineCap");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.lineCap;
 ctx.save();
 _assertSame(ctx.lineCap, old, "ctx.lineCap", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html
index 0211a88a64d..347434acb8a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for lineJoin");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.lineJoin;
 ctx.save();
 _assertSame(ctx.lineJoin, old, "ctx.lineJoin", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js
index 714537e7393..997ce8816be 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for lineJoin");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.lineJoin;
 ctx.save();
 _assertSame(ctx.lineJoin, old, "ctx.lineJoin", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html
index 13091117655..f5497e6f33f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for lineWidth");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.lineWidth;
 ctx.save();
 _assertSame(ctx.lineWidth, old, "ctx.lineWidth", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js
index 02bda8ac09b..3aa8ca20e7a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for lineWidth");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.lineWidth;
 ctx.save();
 _assertSame(ctx.lineWidth, old, "ctx.lineWidth", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html
index d579e74d714..ec86c826aaf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for miterLimit");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.miterLimit;
 ctx.save();
 _assertSame(ctx.miterLimit, old, "ctx.miterLimit", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js
index 608593c8f9d..a1eafd6d272 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for miterLimit");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.miterLimit;
 ctx.save();
 _assertSame(ctx.miterLimit, old, "ctx.miterLimit", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.html
index 702be9518cc..1ee5e5adb3c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.restore();
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.worker.js
index 53430287f33..0dc2e8a8cca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() does not affect the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.restore();
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html
index 403b0c29c5a..170d30ec8c4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for shadowBlur");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.shadowBlur;
 ctx.save();
 _assertSame(ctx.shadowBlur, old, "ctx.shadowBlur", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js
index 3bfed141f9a..7af579924da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for shadowBlur");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.shadowBlur;
 ctx.save();
 _assertSame(ctx.shadowBlur, old, "ctx.shadowBlur", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html
index d62da58a48d..9108d0ddbcf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for shadowColor");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.shadowColor;
 ctx.save();
 _assertSame(ctx.shadowColor, old, "ctx.shadowColor", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js
index ac23acf95ae..fd3583c335f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for shadowColor");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.shadowColor;
 ctx.save();
 _assertSame(ctx.shadowColor, old, "ctx.shadowColor", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html
index 4676d35f633..0d3bf567309 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for shadowOffsetX");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.shadowOffsetX;
 ctx.save();
 _assertSame(ctx.shadowOffsetX, old, "ctx.shadowOffsetX", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js
index 564907760d2..8c58200a9d3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for shadowOffsetX");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.shadowOffsetX;
 ctx.save();
 _assertSame(ctx.shadowOffsetX, old, "ctx.shadowOffsetX", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html
index a0665ada462..9d6fb4819f4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for shadowOffsetY");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.shadowOffsetY;
 ctx.save();
 _assertSame(ctx.shadowOffsetY, old, "ctx.shadowOffsetY", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js
index 3dcd6324d52..27b1804e00d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for shadowOffsetY");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.shadowOffsetY;
 ctx.save();
 _assertSame(ctx.shadowOffsetY, old, "ctx.shadowOffsetY", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html
index 5bbb3b66cf0..a41db9e4998 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() can be nested as a stack");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.restore();
 _assertSame(ctx.lineWidth, 2, "ctx.lineWidth", "2");
 ctx.restore();
 _assertSame(ctx.lineWidth, 1, "ctx.lineWidth", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js
index aa20af37b4b..c4ab388e62e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() can be nested as a stack");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.restore();
 _assertSame(ctx.lineWidth, 2, "ctx.lineWidth", "2");
 ctx.restore();
 _assertSame(ctx.lineWidth, 1, "ctx.lineWidth", "1");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html
index 591bbd3c1d4..9553177d4b8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() stack depth is not unreasonably limited");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ for (var i = limit-1; i > 0; --i)
     _assertSame(ctx.lineWidth, i, "ctx.lineWidth", "i");
     ctx.restore();
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js
index abe66e2e426..67ae62dac81 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() stack depth is not unreasonably limited");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ for (var i = limit-1; i > 0; --i)
     _assertSame(ctx.lineWidth, i, "ctx.lineWidth", "i");
     ctx.restore();
 }
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html
index 4df4b8b81c8..09b92bb78d4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() works for strokeStyle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ old = ctx.strokeStyle;
 ctx.save();
 _assertSame(ctx.strokeStyle, old, "ctx.strokeStyle", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js
index eaafacf02f6..24c47f7b0c3 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() works for strokeStyle");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ old = ctx.strokeStyle;
 ctx.save();
 _assertSame(ctx.strokeStyle, old, "ctx.strokeStyle", "old");
 ctx.restore();
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.html
index 0d34e61bea8..ba1aabd940a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("save()/restore() affects the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.restore();
 ctx.fillStyle = '#f00';
 ctx.fillRect(-200, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.worker.js
index f65c59eddf1..224039e698a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.transformation.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("save()/restore() affects the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.restore();
 ctx.fillStyle = '#f00';
 ctx.fillRect(-200, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html
index ff3994cfb08..2dab6e8c706 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("restore() with an empty stack has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ for (var i = 0; i < 16; ++i)
 ctx.lineWidth = 0.5;
 ctx.restore();
 _assertSame(ctx.lineWidth, 0.5, "ctx.lineWidth", "0.5");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js
index ded24a862bb..f38a95c4f16 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("restore() with an empty stack has no effect");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ for (var i = 0; i < 16; ++i)
 ctx.lineWidth = 0.5;
 ctx.restore();
 _assertSame(ctx.lineWidth, 0.5, "ctx.lineWidth", "0.5");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.html
index 33a3c595041..aaed40136b1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("canvas is readonly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ var d = ctx.canvas;
 _assertDifferent(offscreenCanvas2, d, "offscreenCanvas2", "d");
 ctx.canvas = offscreenCanvas2;
 _assertSame(ctx.canvas, d, "ctx.canvas", "d");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.worker.js
index fc914a4987e..d991b1928a1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.readonly.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("canvas is readonly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ var d = ctx.canvas;
 _assertDifferent(offscreenCanvas2, d, "offscreenCanvas2", "d");
 ctx.canvas = offscreenCanvas2;
 _assertSame(ctx.canvas, d, "ctx.canvas", "d");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.html
index 808371d4b0f..458d349d477 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("canvas refers back to its canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.canvas, offscreenCanvas, "ctx.canvas", "offscreenCanvas");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.worker.js
index 0a9af42ef00..3f5fbe269bf 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.canvas.reference.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("canvas refers back to its canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(ctx.canvas, offscreenCanvas, "ctx.canvas", "offscreenCanvas");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.html
index c2848eb9b18..78765fab835 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("The 2D context is implemented");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 _assertDifferent(offscreenCanvas2.getContext('2d'), null, "offscreenCanvas2.getContext('2d')", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.worker.js
index 4238493f73f..f61cab832c8 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.exists.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("The 2D context is implemented");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 _assertDifferent(offscreenCanvas2.getContext('2d'), null, "offscreenCanvas2.getContext('2d')", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.html
index f2120ec9d81..ea209dcd112 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("The 2D context ignores extra getContext arguments");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 _assertDifferent(offscreenCanvas2.getContext('2d', false, {}, [], 1, "2"), null, "offscreenCanvas2.getContext('2d', false, {}, [], 1, \"2\")", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.worker.js
index aa95095203a..c751760afd1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.extraargs.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("The 2D context ignores extra getContext arguments");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 _assertDifferent(offscreenCanvas2.getContext('2d', false, {}, [], 1, "2"), null, "offscreenCanvas2.getContext('2d', false, {}, [], 1, \"2\")", "null");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.html
index cdf84a5e564..6b6188bfc09 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getContext('2d') returns objects which share canvas state");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillStyle = '#f00';
 ctx2.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.worker.js
index 22fdda6db51..53cab62995f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.shared.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getContext('2d') returns objects which share canvas state");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillStyle = '#f00';
 ctx2.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.html
index 83f4bf0ad5a..913795832dd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getContext('2d') returns the same object");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 _assertSame(offscreenCanvas2.getContext('2d'), offscreenCanvas2.getContext('2d'), "offscreenCanvas2.getContext('2d')", "offscreenCanvas2.getContext('2d')");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.worker.js
index 99e7de287ed..3b311526f06 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/2d.getcontext.unique.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getContext('2d') returns the same object");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 _assertSame(offscreenCanvas2.getContext('2d'), offscreenCanvas2.getContext('2d'), "offscreenCanvas2.getContext('2d')", "offscreenCanvas2.getContext('2d')");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.html
index 9c73224f0d1..ae8dd692148 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext(); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.worker.js
index 356333464cd..9dbd97c861a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.arguments.missing.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext(); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.html
index a344c69e11a..56431e2e4fc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Context name \"2D\" is unrecognised; matching is case sensitive");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext('2D'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.worker.js
index 3fcea3a71f8..b41c1f767f5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.casesensitive.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Context name \"2D\" is unrecognised; matching is case sensitive");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext('2D'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.html
index 4b829c73634..92f37506eaa 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getContext with empty string returns null");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext(""); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.worker.js
index bce1106fa25..54406bb5bfe 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.emptystring.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getContext with empty string returns null");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext(""); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.html
index 3dc2ad9eddd..8e846714fad 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("getContext with unrecognised context name returns null");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext('This is not an implemented context in any real browser'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.worker.js
index e9a961d8e31..855f997118b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badname.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("getContext with unrecognised context name returns null");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext('This is not an implemented context in any real browser'); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.html
index ced3fdee973..5511c4f21ec 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Context name \"2d\" plus a suffix is unrecognised");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext("2d#"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js
index f80205b56d7..c56ea7eb615 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Context name \"2d\" plus a suffix is unrecognised");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext("2d#"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.html
index 4df8ea93da2..b8660ae7fc6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Context name \"2d\" plus a \"\\0\" suffix is unrecognised");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext("2d\0"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js
index e241fdef9f8..efe45b9196b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Context name \"2d\" plus a \"\\0\" suffix is unrecognised");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext("2d\0"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.html
index 8a542081479..89f2655d563 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Context name which kind of looks like \"2d\" is unrecognised");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext("2\uFF44"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.worker.js
index 451c2ea5bd2..a533117562d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/context.unrecognised.unicode.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Context name which kind of looks like \"2d\" is unrecognised");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 assert_throws(new TypeError(), function() { offscreenCanvas2.getContext("2\uFF44"); });
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.html
index 5d36c7ef67d..6dfcd7a2f0f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.html
@@ -11,13 +11,16 @@
 
 <script>
 var t = async_test("Initial state is transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js
index 847c3c37379..24144657f8b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js
@@ -7,13 +7,16 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Initial state is transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.html
index 8406dbb3d2f..d54d01b3861 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Resetting the canvas state resets 2D state variables");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -80,6 +84,5 @@ offscreenCanvas.width = 100;
 _assertSame(ctx.globalCompositeOperation, default_val, "ctx.globalCompositeOperation", "default_val");
 
 t.done();
-
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.worker.js
index 37082d270e4..7ff0a0ca9da 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.2dstate.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Resetting the canvas state resets 2D state variables");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -76,6 +80,5 @@ offscreenCanvas.width = 100;
 _assertSame(ctx.globalCompositeOperation, default_val, "ctx.globalCompositeOperation", "default_val");
 
 t.done();
-
 });
 done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.html
index eb25f539e8c..b536e8ced8d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Resetting the canvas state resets the current clip region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ offscreenCanvas.width = 100;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.worker.js
index a0e28441554..c6e06ca0d01 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.clip.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Resetting the canvas state resets the current clip region");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ offscreenCanvas.width = 100;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.html
index b3eed9e013b..45ffb6974e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Changing size resets canvas to transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255");
 offscreenCanvas.width = 50;
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.worker.js
index 3243e93b379..206ba672fed 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.different.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Changing size resets canvas to transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255");
 offscreenCanvas.width = 50;
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.html
index 97d7654b11a..1dce8dabe58 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Resetting the canvas state does not invalidate any existing gradients");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.worker.js
index 7ed02a15eca..97b0b1a5cce 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.gradient.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Resetting the canvas state does not invalidate any existing gradients");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html
index c767a3cb972..b9c4ab57177 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Resetting the canvas state resets the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ offscreenCanvas.width = 100;
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js
index 7a75feaa0a5..24e7d3d01d2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Resetting the canvas state resets the current path");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ offscreenCanvas.width = 100;
 ctx.fillStyle = '#f00';
 ctx.fill();
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.html
index 9ba9f9ed5f6..a8a4b769e24 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Resetting the canvas state does not invalidate any existing patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = p;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.worker.js
index 4c94691f509..09c3d7540b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.pattern.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Resetting the canvas state does not invalidate any existing patterns");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = p;
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.html
index ed9260c728b..36c3fea0f1e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting size (not changing the value) resets canvas to transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255");
 offscreenCanvas.width = 100;
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.worker.js
index aad9ebfe765..cc202b485b7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.same.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting size (not changing the value) resets canvas to transparent black");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.fillRect(0, 0, 50, 50);
 _assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255");
 offscreenCanvas.width = 100;
 _assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.html
index 8686155d5cf..a1b52e7db0a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Resetting the canvas state resets the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ offscreenCanvas.width = 100;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.worker.js
index 0022c78ef3f..4bc45d00367 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/initial.reset.transform.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Resetting the canvas state resets the current transformation matrix");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ offscreenCanvas.width = 100;
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.html
index bb378f2fd6a..da1997cfcc0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Default width/height when attributes are missing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.worker.js
index ecdc53d495c..020885c9711 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.default.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Default width/height when attributes are missing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -14,7 +18,6 @@ var ctx = offscreenCanvas.getContext('2d');
 
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.html
index d422aabdbc4..e4af962896b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Getting/setting width/height IDL attributes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -32,7 +36,6 @@ offscreenCanvas.width = "400x";
 offscreenCanvas.height = "foo";
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.html
index 3d41dc4ee4a..b03ac63a7f7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting width/height IDL attributes to 0");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = 0;
 offscreenCanvas.height = 0;
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js
index 7482e06d2ae..f70b497dfb6 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting width/height IDL attributes to 0");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = 0;
 offscreenCanvas.height = 0;
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.worker.js
index 3846d6d1164..79e9530f892 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.idl.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Getting/setting width/height IDL attributes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -28,7 +32,6 @@ offscreenCanvas.width = "400x";
 offscreenCanvas.height = "foo";
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.html
index e952c73c88e..78f21aa3032 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '100.999';
 offscreenCanvas.height = '100.999';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.worker.js
index b9d9ff98560..e9e1c528639 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.decimal.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '100.999';
 offscreenCanvas.height = '100.999';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.html
index 2c0298620fa..0bbc5888176 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '100em';
 offscreenCanvas.height = '100em';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.worker.js
index 2d1a9fca282..efa88f0f437 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.em.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '100em';
 offscreenCanvas.height = '100em';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.html
index 1bb5f684979..6b403e6e54e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '';
 offscreenCanvas.height = '';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.worker.js
index 07847d83efa..7337ee41930 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.empty.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '';
 offscreenCanvas.height = '';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.html
index 481bc9f9e71..445d5ba61d2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '100e1';
 offscreenCanvas.height = '100e1';
 _assertSame(offscreenCanvas.width, 1000.0, "offscreenCanvas.width", "1000.0");
 _assertSame(offscreenCanvas.height, 1000.0, "offscreenCanvas.height", "1000.0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.worker.js
index a31a7bfd28d..cf56eac6b3d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.exp.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '100e1';
 offscreenCanvas.height = '100e1';
 _assertSame(offscreenCanvas.width, 1000.0, "offscreenCanvas.width", "1000.0");
 _assertSame(offscreenCanvas.height, 1000.0, "offscreenCanvas.height", "1000.0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.html
index 29f298465ad..db7f3217de5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '0x100';
 offscreenCanvas.height = '0x100';
 _assertSame(offscreenCanvas.width, 256, "offscreenCanvas.width", "256");
 _assertSame(offscreenCanvas.height, 256, "offscreenCanvas.height", "256");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.worker.js
index 933d856f8ec..0c3d9b9244d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.hex.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '0x100';
 offscreenCanvas.height = '0x100';
 _assertSame(offscreenCanvas.width, 256, "offscreenCanvas.width", "256");
 _assertSame(offscreenCanvas.height, 256, "offscreenCanvas.height", "256");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.html
index 6263cf8cb58..0a953428b65 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '#!?';
 offscreenCanvas.height = '#!?';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.worker.js
index ee95f10a591..c56e76d1128 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.junk.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '#!?';
 offscreenCanvas.height = '#!?';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.html
index d6af82d39dc..d5ab800f89d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '-100';
 offscreenCanvas.height = '-100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.worker.js
index bd7a366bbe0..f5c8ee2737b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.minus.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '-100';
 offscreenCanvas.height = '-100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.html
index 955d4d22225..ffe7df39071 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '0100';
 offscreenCanvas.height = '0100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.worker.js
index bddc3db142c..6e0a7b0f800 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.octal.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '0100';
 offscreenCanvas.height = '0100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.html
index 871e431ce37..424c77ecd2d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '  ';
 offscreenCanvas.height = '  ';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js
index e8c95529891..14860bdc6c7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '  ';
 offscreenCanvas.height = '  ';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.html
index 9c8cca111be..4e98d7871ca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '100%';
 offscreenCanvas.height = '100%';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.worker.js
index b48ab71f760..6e2b995433f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.percent.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '100%';
 offscreenCanvas.height = '100%';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.html
index 02d7dc75824..99b3155e858 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '+100';
 offscreenCanvas.height = '+100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.worker.js
index 4c6ad634175..da716641ff7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.plus.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '+100';
 offscreenCanvas.height = '+100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.html
index 9360753adc4..200f028dcc7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '  100';
 offscreenCanvas.height = '  100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.worker.js
index 5bdc1a22fdd..812b2503ae1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.space.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '  100';
 offscreenCanvas.height = '  100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
index 21562d2b110..3769448de3c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '100#!?';
 offscreenCanvas.height = '100#!?';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
index f983af3a9a1..2b3e0db5a2b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '100#!?';
 offscreenCanvas.height = '100#!?';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.html
index c73f616a508..00ef9cf41d9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '	100';
 offscreenCanvas.height = '	100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js
index 39ccbb5a5d4..f46beb3f5e5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '	100';
 offscreenCanvas.height = '	100';
 _assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
 _assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.html
index b935ff588cd..03b20eecd0c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = '0';
 offscreenCanvas.height = '0';
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.worker.js
index d7f60d8a780..26eeb9826de 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Parsing of non-negative integers");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = '0';
 offscreenCanvas.height = '0';
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.html
index 0395fb36083..00049584416 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting IDL attributes updates IDL and content attributes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = 120;
 offscreenCanvas.height = 60;
 _assertSame(offscreenCanvas.width, 120, "offscreenCanvas.width", "120");
 _assertSame(offscreenCanvas.height, 60, "offscreenCanvas.height", "60");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js
index c9ad17b1883..758015f43fb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting IDL attributes updates IDL and content attributes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = 120;
 offscreenCanvas.height = 60;
 _assertSame(offscreenCanvas.width, 120, "offscreenCanvas.width", "120");
 _assertSame(offscreenCanvas.height, 60, "offscreenCanvas.height", "60");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.html
index 9dbdde9b29a..e88a241e421 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Setting IDL attributes to 0 updates IDL and content attributes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ offscreenCanvas.width = 0;
 offscreenCanvas.height = 0;
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js
index a5b94006fb7..83fdd60d648 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Setting IDL attributes to 0 updates IDL and content attributes");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -16,7 +20,6 @@ offscreenCanvas.width = 0;
 offscreenCanvas.height = 0;
 _assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0");
 _assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.html b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.html
index 2531247c40b..4fcad4ab53e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.html
@@ -11,6 +11,10 @@
 <p class="notes">Not sure how reasonable this is, but the spec doesn't say there's an upper limit on the size.
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ offscreenCanvas.width = n;
 offscreenCanvas.height = n;
 _assertSame(offscreenCanvas.width, n, "offscreenCanvas.width", "n");
 _assertSame(offscreenCanvas.height, n, "offscreenCanvas.height", "n");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.worker.js
index 536d156e4ff..c2a0581607f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/the-offscreen-canvas/size.large.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -17,7 +21,6 @@ offscreenCanvas.width = n;
 offscreenCanvas.height = n;
 _assertSame(offscreenCanvas.width, n, "offscreenCanvas.width", "n");
 _assertSame(offscreenCanvas.height, n, "offscreenCanvas.height", "n");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/tools/templates.yaml b/tests/wpt/web-platform-tests/offscreen-canvas/tools/templates.yaml
index 838d8f845ec..15d37239cdc 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/tools/templates.yaml
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/tools/templates.yaml
@@ -12,14 +12,16 @@ w3c: |
     %(notes)s
     <script>
     var t = async_test("%(escaped_desc)s");
+    var t_pass = t.done.bind(t);
+    var t_fail = t.step_func(function(reason) {
+        throw reason;
+    });
     t.step(function() {
 
     var offscreenCanvas = new OffscreenCanvas(100, 50);
     var ctx = offscreenCanvas.getContext('2d');
 
     %(code)s
-    t.done();
-
     });
     </script>
 
@@ -34,13 +36,15 @@ w3cworker: |
     importScripts("/2dcontext/resources/canvas-tests.js");
 
     var t = async_test("%(escaped_desc)s");
+    var t_pass = t.done.bind(t);
+    var t_fail = t.step_func(function(reason) {
+        throw reason;
+    });
     t.step(function() {
 
     var offscreenCanvas = new OffscreenCanvas(100, 50);
     var ctx = offscreenCanvas.getContext('2d');
 
     %(code)s
-    t.done();
-
     });
     done();
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/tools/tests2d.yaml b/tests/wpt/web-platform-tests/offscreen-canvas/tools/tests2d.yaml
index 0b346bb658e..6662668f373 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/tools/tests2d.yaml
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/tools/tests2d.yaml
@@ -34,6 +34,7 @@
     ctx.save();
     @assert ctx.%(key)s === old;
     ctx.restore();
+    t.done();
     """ % { 'key':key, 'value':value }
         } )
 
@@ -51,7 +52,7 @@
     offscreenCanvas.width = 100;
     @assert ctx.%(key)s === default_val;
     """ % { 'key':key, 'value':value }
-        for key,value in state),
+        for key,value in state) + "\nt.done();",
     } )
 
 - name: 2d.state.saverestore.transformation
@@ -67,6 +68,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(-200, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.state.saverestore.clip
   desc: save()/restore() affects the clipping path
@@ -82,6 +84,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.state.saverestore.path
   desc: save()/restore() does not affect the current path
@@ -96,6 +99,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.state.saverestore.bitmap
   desc: save()/restore() does not affect the current bitmap
@@ -109,6 +113,7 @@
     ctx.fillRect(0, 0, 100, 50);
     ctx.restore();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.state.saverestore.stack
   desc: save()/restore() can be nested as a stack
@@ -126,6 +131,7 @@
     @assert ctx.lineWidth === 2;
     ctx.restore();
     @assert ctx.lineWidth === 1;
+    t.done();
 
 - name: 2d.state.saverestore.stackdepth
   desc: save()/restore() stack depth is not unreasonably limited
@@ -144,6 +150,7 @@
         @assert ctx.lineWidth === i;
         ctx.restore();
     }
+    t.done();
 
 - name: 2d.state.saverestore.underflow
   desc: restore() with an empty stack has no effect
@@ -155,6 +162,7 @@
     ctx.lineWidth = 0.5;
     ctx.restore();
     @assert ctx.lineWidth === 0.5;
+    t.done();
 
 - name: 2d.transformation.order
   desc: Transformations are applied in the right order
@@ -168,6 +176,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, -50, 50, 50);
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.scale.basic
   desc: scale() works
@@ -180,6 +189,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 50, 12.5);
     @assert pixel 90,40 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.scale.zero
   desc: scale() with a scale factor of zero works
@@ -201,6 +211,7 @@
     ctx.fillRect(0, 0, 100, 50);
     ctx.restore();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.scale.negative
   desc: scale() with negative scale factors works
@@ -221,6 +232,7 @@
     ctx.restore();
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.scale.large
   desc: scale() with large scale factors works
@@ -234,6 +246,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 1, 1);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.scale.nonfinite
   desc: scale() with Infinity/NaN is ignored
@@ -247,6 +260,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -10, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.scale.multiple
   desc: Multiple scale()s combine
@@ -260,6 +274,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 50, 25);
     @assert pixel 90,40 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.transformation.rotate.zero
@@ -273,6 +288,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.rotate.radians
   desc: rotate() uses radians
@@ -285,6 +301,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -50, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.rotate.direction
   desc: rotate() is clockwise
@@ -297,6 +314,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, -100, 50, 100);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.rotate.wrap
   desc: rotate() wraps large positive values correctly
@@ -314,6 +332,7 @@
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,2 == 0,255,0,255;
     @assert pixel 98,47 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.rotate.wrapnegative
   desc: rotate() wraps large negative values correctly
@@ -328,6 +347,7 @@
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,2 == 0,255,0,255;
     @assert pixel 98,47 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.rotate.nonfinite
   desc: rotate() with Infinity/NaN is ignored
@@ -341,6 +361,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -10, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.translate.basic
   desc: translate() works
@@ -353,6 +374,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -50, 100, 50);
     @assert pixel 90,40 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.translate.nonfinite
   desc: translate() with Infinity/NaN is ignored
@@ -366,6 +388,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -10, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.transformation.transform.identity
@@ -379,6 +402,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.transform.skewed
   desc: transform() with skewy matrix transforms correctly
@@ -413,6 +437,7 @@
     @assert pixel 61,19 == 0,255,0,255;
     @assert pixel 39,31 == 0,255,0,255;
     @assert pixel 61,31 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.transform.multiply
   desc: transform() multiplies the CTM
@@ -426,6 +451,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.transform.nonfinite
   desc: transform() with Infinity/NaN is ignored
@@ -439,6 +465,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -10, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.transformation.setTransform.skewed
@@ -473,6 +500,7 @@
     @assert pixel 61,19 == 0,255,0,255;
     @assert pixel 39,31 == 0,255,0,255;
     @assert pixel 61,31 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.setTransform.multiple
   testing:
@@ -485,6 +513,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 50, 25);
     @assert pixel 75,35 == 0,255,0,255;
+    t.done();
 
 - name: 2d.transformation.setTransform.nonfinite
   desc: setTransform() with Infinity/NaN is ignored
@@ -498,6 +527,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, -10, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.composite.globalAlpha.range
   testing:
@@ -513,6 +543,7 @@
     @assert ctx.globalAlpha === 0;
     ctx.globalAlpha = 1;
     @assert ctx.globalAlpha === 1;
+    t.done();
 
 - name: 2d.composite.globalAlpha.invalid
   testing:
@@ -526,12 +557,14 @@
     @assert ctx.globalAlpha === a;
     ctx.globalAlpha = NaN;
     @assert ctx.globalAlpha === a;
+    t.done();
 
 - name: 2d.composite.globalAlpha.default
   testing:
     - 2d.composite.globalAlpha.default
   code: |
     @assert ctx.globalAlpha === 1.0;
+    t.done();
 
 - name: 2d.composite.globalAlpha.fill
   testing:
@@ -543,6 +576,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 ==~ 2,253,0,255;
+    t.done();
 
 - name: 2d.composite.globalAlpha.image
   testing:
@@ -563,7 +597,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 2,253,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.composite.globalAlpha.canvas
   testing:
@@ -578,6 +612,7 @@
     ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
     ctx.drawImage(offscreenCanvas2, 0, 0);
     @assert pixel 50,25 ==~ 2,253,0,255;
+    t.done();
 
 - name: 2d.composite.globalAlpha.imagepattern
   testing:
@@ -599,7 +634,7 @@
         ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
         ctx.fillRect(0, 0, 100, 50);
         @assert pixel 50,25 ==~ 2,253,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.composite.globalAlpha.canvaspattern
   testing:
@@ -615,6 +650,7 @@
     ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 ==~ 2,253,0,255;
+    t.done();
 
 - name: 2d.composite.globalAlpha.canvascopy
   testing:
@@ -630,6 +666,7 @@
     ctx.globalAlpha = 0.51;
     ctx.drawImage(offscreenCanvas2, 0, 0);
     @assert pixel 50,25 ==~ 0,255,0,130;
+    t.done();
 
 
 - meta: |
@@ -700,6 +737,7 @@
     ctx.fillStyle = 'rgba%s';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 ==~ %s +/- 5;
+    t.done();
     """ % (dest, op, src, to_test(expected)),
             } )
 
@@ -726,7 +764,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ %s +/- 5;
-    });
+    }).then(t_pass, t_fail);
     """ % (dest, op, to_test(expected)),
             } )
 
@@ -756,7 +794,7 @@
         ctx.globalCompositeOperation = '%s';
         ctx.drawImage(offscreenCanvas2, 0, 0);
         @assert pixel 50,25 ==~ %s +/- 5;
-    });
+    }).then(t_pass, t_fail);
     """ % (dest, op, to_test(expected)),
             } )
 
@@ -776,6 +814,7 @@
     ctx.translate(0, 25);
     ctx.fillRect(0, 50, 100, 50);
     @assert pixel 50,25 ==~ %s +/- 5;
+    t.done();
     """ % (dest, op, src, to_test(expected0)),
             }
             if op == 'destination-in':
@@ -808,7 +847,7 @@
         ctx.drawImage(response, 40, 40, 10, 10, 40, 50, 10, 10);
         @assert pixel 15,15 ==~ %s +/- 5;
         @assert pixel 50,25 ==~ %s +/- 5;
-    });
+    }).then(t_pass, t_fail);
     """ % (dest, op, to_test(expected0), to_test(expected0)),
             } )
 
@@ -827,6 +866,7 @@
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     ctx.drawImage(offscreenCanvas2, 0, 0);
     @assert pixel 50,25 ==~ %s +/- 5;
+    t.done();
     """ % (dest, op, to_test(expected0)),
             } )
 
@@ -856,7 +896,7 @@
         ctx.fillStyle = ctx.createPattern(response, 'no-repeat');
         ctx.fillRect(0, 50, 100, 50);
         @assert pixel 50,25 ==~ %s +/- 5;
-    });
+    }).then(t_pass, t_fail);
     """ % (dest, op, to_test(expected0)),
             } )
 
@@ -875,6 +915,7 @@
     ctx.fillRect(0, 0, 50, 50);
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
     """ % (op),
         } )
 
@@ -890,6 +931,7 @@
         ctx.globalCompositeOperation = modes[i];
         @assert ctx.globalCompositeOperation === modes[i];
     }
+    t.done();
 
 - name: 2d.composite.operation.unrecognised
   testing:
@@ -898,6 +940,7 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'nonexistent';
     @assert ctx.globalCompositeOperation === 'xor';
+    t.done();
 
 - name: 2d.composite.operation.darker
   testing:
@@ -906,6 +949,7 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'darker';
     @assert ctx.globalCompositeOperation === 'xor';
+    t.done();
 
 - name: 2d.composite.operation.over
   testing:
@@ -914,6 +958,7 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'over';
     @assert ctx.globalCompositeOperation === 'xor';
+    t.done();
 
 - name: 2d.composite.operation.clear
   testing:
@@ -922,6 +967,7 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'clear';
     @assert ctx.globalCompositeOperation === 'clear';
+    t.done();
 
 - name: 2d.composite.operation.highlight
   testing:
@@ -930,6 +976,7 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'highlight';
     @assert ctx.globalCompositeOperation === 'xor';
+    t.done();
 
 - name: 2d.composite.operation.nullsuffix
   testing:
@@ -938,6 +985,7 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'source-over\0';
     @assert ctx.globalCompositeOperation === 'xor';
+    t.done();
 
 - name: 2d.composite.operation.casesensitive
   testing:
@@ -946,12 +994,14 @@
     ctx.globalCompositeOperation = 'xor';
     ctx.globalCompositeOperation = 'Source-over';
     @assert ctx.globalCompositeOperation === 'xor';
+    t.done();
 
 - name: 2d.composite.operation.default
   testing:
     - 2d.composite.operation.default
   code: |
     @assert ctx.globalCompositeOperation === 'source-over';
+    t.done();
 
 - meta: |
     # Colour parsing tests
@@ -1052,6 +1102,7 @@
     ctx.fillStyle = '%s';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == %d,%d,%d,%d;
+    t.done();
     """ % (string, r,g,b,a),
         }
         tests.append(test)
@@ -1116,6 +1167,7 @@
     try { ctx.fillStyle = '%s'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
     """ % string,
         }
         tests.append(test)
@@ -1132,6 +1184,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillStyle = '%s';
     @assert ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/; // test that it's not red
+    t.done();
     """ % (string,),
         }
         tests.append(test)
@@ -1146,6 +1199,7 @@
     ctx.fillStyle = 'invalid';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillStyle.invalidtype
   testing:
@@ -1157,6 +1211,7 @@
     ctx.fillStyle = null;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillStyle.get.solid
   testing:
@@ -1165,6 +1220,7 @@
   code: |
     ctx.fillStyle = '#fa0';
     @assert ctx.fillStyle === '#ffaa00';
+    t.done();
 
 - name: 2d.fillStyle.get.semitransparent
   testing:
@@ -1173,6 +1229,7 @@
   code: |
     ctx.fillStyle = 'rgba(255,255,255,0.45)';
     @assert ctx.fillStyle =~ /^rgba\(255, 255, 255, 0\.4\d+\)$/;
+    t.done();
 
 - name: 2d.fillStyle.get.transparent
   testing:
@@ -1181,18 +1238,21 @@
   code: |
     ctx.fillStyle = 'rgba(0,0,0,0)';
     @assert ctx.fillStyle === 'rgba(0, 0, 0, 0)';
+    t.done();
 
 - name: 2d.fillStyle.default
   testing:
     - 2d.colours.default
   code: |
     @assert ctx.fillStyle === '#000000';
+    t.done();
 
 - name: 2d.strokeStyle.default
   testing:
     - 2d.colours.default
   code: |
     @assert ctx.strokeStyle === '#000000';
+    t.done();
 
 - name: 2d.gradient.interpolate.solid
   testing:
@@ -1204,6 +1264,7 @@
     ctx.fillStyle = g;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.interpolate.colour
   testing:
@@ -1217,6 +1278,7 @@
     @assert pixel 25,25 ==~ 191,191,63,255 +/- 3;
     @assert pixel 50,25 ==~ 127,127,127,255 +/- 3;
     @assert pixel 75,25 ==~ 63,63,191,255 +/- 3;
+    t.done();
 
 - name: 2d.gradient.interpolate.alpha
   testing:
@@ -1232,6 +1294,7 @@
     @assert pixel 25,25 ==~ 191,191,63,255 +/- 3;
     @assert pixel 50,25 ==~ 127,127,127,255 +/- 3;
     @assert pixel 75,25 ==~ 63,63,191,255 +/- 3;
+    t.done();
 
 - name: 2d.gradient.interpolate.colouralpha
   testing:
@@ -1245,6 +1308,7 @@
     @assert pixel 25,25 ==~ 190,190,65,65 +/- 3;
     @assert pixel 50,25 ==~ 126,126,128,128 +/- 3;
     @assert pixel 75,25 ==~ 62,62,192,192 +/- 3;
+    t.done();
 
 - name: 2d.gradient.interpolate.outside
   testing:
@@ -1261,6 +1325,7 @@
     @assert pixel 20,25 ==~ 0,255,0,255;
     @assert pixel 50,25 ==~ 0,255,0,255;
     @assert pixel 80,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.interpolate.zerosize.fill
   testing:
@@ -1275,6 +1340,7 @@
     ctx.rect(0, 0, 100, 50);
     ctx.fill();
     @assert pixel 40,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.interpolate.zerosize.stroke
   testing:
@@ -1297,6 +1363,7 @@
     @assert pixel 19,21 == 0,255,0,255;
     @assert pixel 20,21 == 0,255,0,255;
     @assert pixel 21,21 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.interpolate.zerosize.fillRect
   testing:
@@ -1310,6 +1377,7 @@
     ctx.fillStyle = g;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 40,20 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.gradient.interpolate.zerosize.strokeRect
   testing:
@@ -1331,6 +1399,7 @@
     @assert pixel 19,21 == 0,255,0,255;
     @assert pixel 20,21 == 0,255,0,255;
     @assert pixel 21,21 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.gradient.interpolate.vertical
@@ -1345,6 +1414,7 @@
     @assert pixel 50,12 ==~ 191,191,63,255 +/- 10;
     @assert pixel 50,25 ==~ 127,127,127,255 +/- 5;
     @assert pixel 50,37 ==~ 63,63,191,255 +/- 10;
+    t.done();
 
 - name: 2d.gradient.interpolate.multiple
   testing:
@@ -1360,6 +1430,7 @@
     @assert pixel 50,25 ==~ 127,255,127,255 +/- 3;
     @assert pixel 100,25 ==~ 0,255,255,255 +/- 3;
     @assert pixel 150,25 ==~ 127,127,255,255 +/- 3;
+    t.done();
 
 - name: 2d.gradient.interpolate.overlap
   testing:
@@ -1391,6 +1462,7 @@
     @assert pixel 101,25 ==~ 255,255,0,255 +/- 16;
     @assert pixel 149,25 ==~ 0,0,255,255 +/- 16;
     @assert pixel 151,25 ==~ 255,255,0,255 +/- 16;
+    t.done();
 
 - name: 2d.gradient.interpolate.overlap2
   testing:
@@ -1412,6 +1484,7 @@
     @assert pixel 40,25 == 0,255,0,255;
     @assert pixel 60,25 == 0,255,0,255;
     @assert pixel 80,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.empty
   testing:
@@ -1423,6 +1496,7 @@
     ctx.fillStyle = g;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.object.update
   testing:
@@ -1436,6 +1510,7 @@
     g.addColorStop(0.9, '#0f0');
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.object.compare
   testing:
@@ -1446,6 +1521,7 @@
     @assert g1 !== g2;
     ctx.fillStyle = g1;
     @assert ctx.fillStyle === g1;
+    t.done();
 
 - name: 2d.gradient.object.crosscanvas
   code: |
@@ -1458,6 +1534,7 @@
     ctx.fillStyle = g;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.object.invalidoffset
   testing:
@@ -1469,6 +1546,7 @@
     @assert throws TypeError g.addColorStop(Infinity, '#000');
     @assert throws TypeError g.addColorStop(-Infinity, '#000');
     @assert throws TypeError g.addColorStop(NaN, '#000');
+    t.done();
 
 - name: 2d.gradient.object.invalidcolour
   testing:
@@ -1480,6 +1558,7 @@
     @assert throws SYNTAX_ERR g.addColorStop(0, 'undefined');
     @assert throws SYNTAX_ERR g.addColorStop(0, null);
     @assert throws SYNTAX_ERR g.addColorStop(0, undefined);
+    t.done();
 
 - name: 2d.gradient.linear.nonfinite
   desc: createLinearGradient() throws TypeError if arguments are not finite
@@ -1487,6 +1566,7 @@
     - 2d.gradient.linear.nonfinite
   code: |
     @nonfinite @assert throws TypeError ctx.createLinearGradient(<0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <1 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>);
+    t.done();
 
 - name: 2d.gradient.linear.transform.1
   desc: Linear gradient coordinates are relative to the coordinate space at the time of filling
@@ -1504,6 +1584,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.linear.transform.2
   desc: Linear gradient coordinates are relative to the coordinate space at the time of filling
@@ -1522,6 +1603,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.linear.transform.3
   desc: Linear gradient transforms do not experience broken caching effects
@@ -1540,6 +1622,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.negative
   desc: createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative
@@ -1549,6 +1632,7 @@
     @assert throws INDEX_SIZE_ERR ctx.createRadialGradient(0, 0, -0.1, 0, 0, 1);
     @assert throws INDEX_SIZE_ERR ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1);
     @assert throws INDEX_SIZE_ERR ctx.createRadialGradient(0, 0, -0.1, 0, 0, -0.1);
+    t.done();
 - name: 2d.gradient.radial.nonfinite
 
   desc: createRadialGradient() throws TypeError if arguments are not finite
@@ -1556,6 +1640,7 @@
     - 2d.gradient.radial.nonfinite
   code: |
     @nonfinite @assert throws TypeError ctx.createRadialGradient(<0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <1 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <1 Infinity -Infinity NaN>);
+    t.done();
 
 - name: 2d.gradient.radial.inside1
   testing:
@@ -1577,6 +1662,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.inside2
   testing:
@@ -1598,6 +1684,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.inside3
   testing:
@@ -1620,6 +1707,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.outside1
   testing:
@@ -1641,6 +1729,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.outside2
   testing:
@@ -1662,6 +1751,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.outside3
   testing:
@@ -1684,6 +1774,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.touch1
   testing:
@@ -1705,6 +1796,7 @@
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 50,48 == 0,255,0,255; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.gradient.radial.touch2
   testing:
@@ -1728,6 +1820,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.touch3
   testing:
@@ -1749,6 +1842,7 @@
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 50,48 == 0,255,0,255; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.gradient.radial.equal
   testing:
@@ -1770,6 +1864,7 @@
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 50,48 == 0,255,0,255; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.gradient.radial.cone.behind
   testing:
@@ -1791,6 +1886,7 @@
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 50,48 == 0,255,0,255; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.gradient.radial.cone.front
   testing:
@@ -1812,6 +1908,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.cone.bottom
   testing:
@@ -1833,6 +1930,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.cone.top
   testing:
@@ -1854,6 +1952,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.cone.beside
   testing:
@@ -1875,6 +1974,7 @@
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 50,48 == 0,255,0,255; @moz-todo
     @assert pixel 98,48 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.gradient.radial.cone.cylinder
   testing:
@@ -1896,6 +1996,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.cone.shape1
   testing:
@@ -1924,6 +2025,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.cone.shape2
   testing:
@@ -1952,6 +2054,7 @@
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.transform.1
   desc: Radial gradient coordinates are relative to the coordinate space at the time of filling
@@ -1970,6 +2073,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.transform.2
   desc: Radial gradient coordinates are relative to the coordinate space at the time of filling
@@ -1989,6 +2093,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.gradient.radial.transform.3
   desc: Radial gradient transforms do not experience broken caching effects
@@ -2008,6 +2113,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.pattern.basic.image
   testing:
@@ -2032,7 +2138,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.basic.canvas
   testing:
@@ -2056,6 +2162,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.pattern.basic.zerocanvas
   testing:
@@ -2076,6 +2183,7 @@
     @assert offscreenCanvas.width === 0;
     @assert offscreenCanvas.height === 0;
     @assert throws INVALID_STATE_ERR ctx.createPattern(offscreenCanvas, 'repeat');
+    t.done();
 
 - name: 2d.pattern.basic.nocontext
   testing:
@@ -2092,24 +2200,28 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.pattern.image.undefined
   testing:
     - 2d.pattern.IDL
   code: |
     @assert throws TypeError ctx.createPattern(undefined, 'repeat');
+    t.done();
 
 - name: 2d.pattern.image.null
   testing:
     - 2d.pattern.IDL
   code: |
     @assert throws TypeError ctx.createPattern(null, 'repeat');
+    t.done();
 
 - name: 2d.pattern.image.string
   testing:
     - 2d.pattern.IDL
   code: |
     @assert throws TypeError ctx.createPattern('../images/red.png', 'repeat');
+    t.done();
 
 - name: 2d.pattern.repeat.empty
   testing:
@@ -2134,43 +2246,49 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.repeat.null
   testing:
     - 2d.pattern.unrecognised
   code: |
     @assert ctx.createPattern(offscreenCanvas, null) != null;
+    t.done();
 
 - name: 2d.pattern.repeat.undefined
   testing:
     - 2d.pattern.unrecognised
   code: |
     @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, undefined);
+    t.done();
 
 - name: 2d.pattern.repeat.unrecognised
   testing:
     - 2d.pattern.unrecognised
   code: |
     @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "invalid");
+    t.done();
 
 - name: 2d.pattern.repeat.unrecognisednull
   testing:
     - 2d.pattern.unrecognised
   code: |
     @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "null");
+    t.done();
 
 - name: 2d.pattern.repeat.case
   testing:
     - 2d.pattern.exact
   code: |
     @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "Repeat");
+    t.done();
 
 - name: 2d.pattern.repeat.nullsuffix
   testing:
     - 2d.pattern.exact
   code: |
     @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "repeat\0");
+    t.done();
 
 - name: 2d.pattern.modify.canvas1
   testing:
@@ -2189,6 +2307,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.pattern.modify.canvas2
   testing:
@@ -2211,6 +2330,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.pattern.crosscanvas
   code: |
@@ -2231,7 +2351,7 @@
         ctx.fillStyle = pattern;
         ctx.fillRect(0, 0, 100, 50);
         @assert pixel 50,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.norepeat.basic
   testing:
@@ -2256,7 +2376,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.norepeat.outside
   testing:
@@ -2286,7 +2406,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.norepeat.coord1
   testing:
@@ -2314,7 +2434,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.norepeat.coord2
   testing:
@@ -2342,7 +2462,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.norepeat.coord3
   testing:
@@ -2370,7 +2490,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeat.basic
   testing:
@@ -2395,7 +2515,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeat.outside
   testing:
@@ -2421,7 +2541,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeat.coord1
   testing:
@@ -2447,7 +2567,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeat.coord2
   testing:
@@ -2470,7 +2590,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeat.coord3
   testing:
@@ -2495,7 +2615,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeatx.basic
   testing:
@@ -2522,7 +2642,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeatx.outside
   testing:
@@ -2549,7 +2669,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeatx.coord1
   testing:
@@ -2579,7 +2699,7 @@
         @assert pixel 98,25 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeaty.basic
   testing:
@@ -2606,7 +2726,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeaty.outside
   testing:
@@ -2633,7 +2753,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.repeaty.coord1
   testing:
@@ -2665,7 +2785,7 @@
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 50,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.orientation.image
   desc: Image patterns do not get flipped when painted
@@ -2696,7 +2816,7 @@
         @assert pixel 98,1 == 0,255,0,255;
         @assert pixel 1,48 == 0,255,0,255;
         @assert pixel 98,48 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.pattern.paint.orientation.canvas
   desc: Canvas patterns do not get flipped when painted
@@ -2720,6 +2840,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowBlur.initial
   testing:
@@ -2727,6 +2848,7 @@
     - 2d.shadow.blur.initial
   code: |
     @assert ctx.shadowBlur === 0;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowBlur.valid
   testing:
@@ -2741,6 +2863,7 @@
     @assert ctx.shadowBlur === 1e6;
     ctx.shadowBlur = 0;
     @assert ctx.shadowBlur === 0;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowBlur.invalid
   testing:
@@ -2758,6 +2881,7 @@
     ctx.shadowBlur = 1;
     ctx.shadowBlur = NaN;
     @assert ctx.shadowBlur === 1;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowOffset.initial
   testing:
@@ -2765,6 +2889,7 @@
   code: |
     @assert ctx.shadowOffsetX === 0;
     @assert ctx.shadowOffsetY === 0;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowOffset.valid
   testing:
@@ -2791,6 +2916,7 @@
     ctx.shadowOffsetY = 1e6;
     @assert ctx.shadowOffsetX === 1e6;
     @assert ctx.shadowOffsetY === 1e6;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowOffset.invalid
   testing:
@@ -2814,12 +2940,14 @@
     ctx.shadowOffsetY = NaN;
     @assert ctx.shadowOffsetX === 1;
     @assert ctx.shadowOffsetY === 2;
+    t.done();
 
 - name: 2d.shadow.attributes.shadowColor.initial
   testing:
     - 2d.shadow.color.initial
   code: |
     @assert ctx.shadowColor === 'rgba(0, 0, 0, 0)';
+    t.done();
 
 - name: 2d.shadow.attributes.shadowColor.valid
   testing:
@@ -2830,6 +2958,7 @@
     @assert ctx.shadowColor === '#00ff00';
     ctx.shadowColor = 'RGBA(0,255, 0,0)';
     @assert ctx.shadowColor === 'rgba(0, 255, 0, 0)';
+    t.done();
 
 - name: 2d.shadow.attributes.shadowColor.invalid
   testing:
@@ -2847,6 +2976,7 @@
     ctx.shadowColor = '#00ff00';
     ctx.shadowColor = undefined;
     @assert ctx.shadowColor === '#00ff00';
+    t.done();
 
 - name: 2d.shadow.enable.off.1
   desc: Shadows are not drawn when only shadowColor is set
@@ -2858,6 +2988,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.enable.off.2
   desc: Shadows are not drawn when only shadowColor is set
@@ -2870,6 +3001,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.enable.blur
   desc: Shadows are drawn if shadowBlur is set
@@ -2883,6 +3015,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.enable.x
   desc: Shadows are drawn if shadowOffsetX is set
@@ -2896,6 +3029,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.enable.y
   desc: Shadows are drawn if shadowOffsetY is set
@@ -2909,6 +3043,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.offset.positiveX
   desc: Shadows can be offset with positive x
@@ -2923,6 +3058,7 @@
     ctx.fillRect(0, 0, 50, 50);
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.offset.negativeX
   desc: Shadows can be offset with negative x
@@ -2937,6 +3073,7 @@
     ctx.fillRect(50, 0, 50, 50);
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.offset.positiveY
   desc: Shadows can be offset with positive y
@@ -2951,6 +3088,7 @@
     ctx.fillRect(0, 0, 100, 25);
     @assert pixel 50,12 == 0,255,0,255;
     @assert pixel 50,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.offset.negativeY
   desc: Shadows can be offset with negative y
@@ -2965,6 +3103,7 @@
     ctx.fillRect(0, 25, 100, 25);
     @assert pixel 50,12 == 0,255,0,255;
     @assert pixel 50,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.outside
   desc: Shadows of shapes outside the visible area can be offset onto the visible area
@@ -2987,6 +3126,7 @@
     @assert pixel 87,25 == 0,255,0,255;
     @assert pixel 50,12 == 0,255,0,255;
     @assert pixel 50,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.clip.1
   desc: Shadows of clipped shapes are still drawn within the clipping region
@@ -3007,6 +3147,7 @@
     ctx.restore();
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.clip.2
   desc: Shadows are not drawn outside the clipping region
@@ -3027,6 +3168,7 @@
     ctx.restore();
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.clip.3
   desc: Shadows of clipped shapes are still drawn within the clipping region
@@ -3048,6 +3190,7 @@
     ctx.restore();
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.stroke.basic
   desc: Shadows are drawn for strokes
@@ -3067,6 +3210,7 @@
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.stroke.cap.1
   desc: Shadows are not drawn for areas outside stroke caps
@@ -3089,6 +3233,7 @@
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.stroke.cap.2
   desc: Shadows are drawn for stroke caps
@@ -3109,6 +3254,7 @@
     @assert pixel 1,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.stroke.join.1
   desc: Shadows are not drawn for areas outside stroke joins
@@ -3131,6 +3277,7 @@
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.stroke.join.2
   desc: Shadows are drawn for stroke joins
@@ -3155,6 +3302,7 @@
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.stroke.join.3
   desc: Shadows are drawn for stroke joins respecting miter limit
@@ -3178,6 +3326,7 @@
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.image.basic
   desc: Shadows are drawn for images
@@ -3202,7 +3351,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, -50);
         @assert pixel 50,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.image.transparent.1
   desc: Shadows are not drawn for transparent images
@@ -3227,7 +3376,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, -50);
         @assert pixel 50,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.image.transparent.2
   desc: Shadows are not drawn for transparent parts of images
@@ -3258,7 +3407,7 @@
         @assert pixel 25,25 == 0,255,0,255;
         @assert pixel 50,25 == 0,255,0,255;
         @assert pixel 75,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.image.alpha
   desc: Shadows are drawn correctly for partially-transparent images
@@ -3283,7 +3432,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, -50);
         @assert pixel 50,25 ==~ 127,0,127,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.image.section
   desc: Shadows are not drawn for areas outside image source rectangles
@@ -3310,7 +3459,7 @@
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 50,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.image.scale
   desc: Shadows are drawn correctly for scaled images
@@ -3337,7 +3486,7 @@
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 50,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.canvas.basic
   desc: Shadows are drawn for canvases
@@ -3354,6 +3503,7 @@
     ctx.shadowOffsetY = 50;
     ctx.drawImage(offscreenCanvas2, 0, -50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.canvas.transparent.1
   desc: Shadows are not drawn for transparent canvases
@@ -3368,6 +3518,7 @@
     ctx.shadowOffsetY = 50;
     ctx.drawImage(offscreenCanvas2, 0, -50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.canvas.transparent.2
   desc: Shadows are not drawn for transparent parts of canvases
@@ -3390,6 +3541,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.canvas.alpha
   desc: Shadows are drawn correctly for partially-transparent canvases
@@ -3406,6 +3558,7 @@
     ctx.shadowColor = '#00f';
     ctx.drawImage(offscreenCanvas2, 0, -50);
     @assert pixel 50,25 ==~ 127,0,127,255;
+    t.done();
 
 - name: 2d.shadow.pattern.basic
   desc: Shadows are drawn for fill patterns
@@ -3431,7 +3584,7 @@
         ctx.shadowOffsetY = 50;
         ctx.fillStyle = pattern;
         ctx.fillRect(0, -50, 100, 50);
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.pattern.transparent.1
   desc: Shadows are not drawn for transparent fill patterns
@@ -3458,7 +3611,7 @@
         ctx.shadowOffsetY = 50;
         ctx.fillStyle = pattern;
         ctx.fillRect(0, -50, 100, 50);
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.pattern.transparent.2
   desc: Shadows are not drawn for transparent parts of fill patterns
@@ -3489,7 +3642,7 @@
         @assert pixel 25,25 == 0,255,0,255;
         @assert pixel 50,25 == 0,255,0,255;
         @assert pixel 75,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.pattern.alpha
   desc: Shadows are drawn correctly for partially-transparent fill patterns
@@ -3515,7 +3668,7 @@
         ctx.shadowColor = '#00f';
         ctx.fillStyle = pattern;
         ctx.fillRect(0, -50, 100, 50);
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.shadow.gradient.basic
   desc: Shadows are drawn for gradient fills
@@ -3533,6 +3686,7 @@
     ctx.fillStyle = gradient;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.gradient.transparent.1
   desc: Shadows are not drawn for transparent gradient fills
@@ -3550,6 +3704,7 @@
     ctx.fillStyle = gradient;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.gradient.transparent.2
   desc: Shadows are not drawn for transparent parts of gradient fills
@@ -3572,6 +3727,7 @@
     @assert pixel 25,25 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 75,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.gradient.alpha
   desc: Shadows are drawn correctly for partially-transparent gradient fills
@@ -3588,6 +3744,7 @@
     ctx.fillStyle = gradient;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 ==~ 127,0,127,255;
+    t.done();
 
 - name: 2d.shadow.transform.1
   desc: Shadows take account of transformations
@@ -3601,6 +3758,7 @@
     ctx.translate(100, 100);
     ctx.fillRect(-100, -150, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.transform.2
   desc: Shadow offsets are not affected by transformations
@@ -3614,6 +3772,7 @@
     ctx.rotate(Math.PI)
     ctx.fillRect(-100, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.alpha.1
   desc: Shadow colour alpha components are used
@@ -3626,6 +3785,7 @@
     ctx.shadowOffsetY = 50;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 ==~ 0,255,0,255 +/- 4;
+    t.done();
 
 - name: 2d.shadow.alpha.2
   desc: Shadow colour alpha components are used
@@ -3638,6 +3798,7 @@
     ctx.shadowOffsetY = 50;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 ==~ 127,0,127,255;
+    t.done();
 
 - name: 2d.shadow.alpha.3
   desc: Shadows are affected by globalAlpha
@@ -3652,6 +3813,7 @@
     ctx.globalAlpha = 0.5;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 ==~ 127,0,127,255;
+    t.done();
 
 - name: 2d.shadow.alpha.4
   desc: Shadows with alpha components are correctly affected by globalAlpha
@@ -3666,6 +3828,7 @@
     ctx.globalAlpha = 0.707;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 ==~ 127,0,127,255;
+    t.done();
 
 - name: 2d.shadow.alpha.5
   desc: Shadows of shapes with alpha components are drawn correctly
@@ -3679,6 +3842,7 @@
     ctx.shadowOffsetY = 50;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 ==~ 127,0,127,255;
+    t.done();
 
 - name: 2d.shadow.composite.1
   desc: Shadows are drawn using globalCompositeOperation
@@ -3693,6 +3857,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-100, 0, 200, 50);
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.composite.2
   desc: Shadows are drawn using globalCompositeOperation
@@ -3707,6 +3872,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(-10, -10, 120, 70);
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.shadow.composite.3
   desc: Areas outside shadows are drawn correctly with destination-out
@@ -3722,6 +3888,7 @@
     ctx.fillRect(200, 0, 100, 50);
     @assert pixel 5,5 ==~ 0,255,0,255;
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.clearRect.basic
   desc: clearRect clears to transparent black
@@ -3732,6 +3899,7 @@
     ctx.fillRect(0, 0, 100, 50);
     ctx.clearRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.clearRect.path
   desc: clearRect does not affect the current path
@@ -3744,6 +3912,7 @@
     ctx.clearRect(0, 0, 16, 16);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.clearRect.zero
   desc: clearRect of zero pixels has no effect
@@ -3756,6 +3925,7 @@
     ctx.clearRect(0, 0, 0, 50);
     ctx.clearRect(0, 0, 0, 0);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.clearRect.negative
   desc: clearRect of negative sizes works
@@ -3772,6 +3942,7 @@
     @assert pixel 75,12 == 0,0,0,0;
     @assert pixel 25,37 == 0,0,0,0;
     @assert pixel 75,37 == 0,0,0,0;
+    t.done();
 
 - name: 2d.clearRect.transform
   desc: clearRect is affected by transforms
@@ -3784,6 +3955,7 @@
     ctx.translate(0, 5);
     ctx.clearRect(0, -5, 10, 5);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.clearRect.globalalpha
   desc: clearRect is not affected by globalAlpha
@@ -3795,6 +3967,7 @@
     ctx.globalAlpha = 0.1;
     ctx.clearRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.clearRect.globalcomposite
   desc: clearRect is not affected by globalCompositeOperation
@@ -3806,6 +3979,7 @@
     ctx.globalCompositeOperation = 'destination-atop';
     ctx.clearRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.clearRect.clip
   desc: clearRect is affected by clipping regions
@@ -3821,6 +3995,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 16, 16);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.clearRect.shadow
   desc: clearRect does not draw shadows
@@ -3835,6 +4010,7 @@
     ctx.shadowOffsetY = 50;
     ctx.clearRect(0, -50, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.clearRect.nonfinite
   desc: clearRect() with Infinity/NaN is ignored
@@ -3845,6 +4021,7 @@
     ctx.fillRect(0, 0, 100, 50);
     @nonfinite ctx.clearRect(<0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <100 Infinity -Infinity NaN>, <50 Infinity -Infinity NaN>);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.basic
   desc: fillRect works
@@ -3854,6 +4031,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.path
   desc: fillRect does not affect the current path
@@ -3867,6 +4045,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.zero
   desc: fillRect of zero pixels has no effect
@@ -3880,6 +4059,7 @@
     ctx.fillRect(0, 0, 0, 50);
     ctx.fillRect(0, 0, 0, 0);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.negative
   desc: fillRect of negative sizes works
@@ -3897,6 +4077,7 @@
     @assert pixel 75,12 == 0,255,0,255;
     @assert pixel 25,37 == 0,255,0,255;
     @assert pixel 75,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.transform
   desc: fillRect is affected by transforms
@@ -3908,6 +4089,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, -5, 10, 5);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 # don't bother testing globalalpha, globalcomposite because they're already heavily used by other test cases
 
@@ -3926,6 +4108,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 16, 16);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.shadow
   desc: fillRect draws shadows
@@ -3940,6 +4123,7 @@
     ctx.shadowOffsetY = 50;
     ctx.fillRect(0, -50, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.fillRect.nonfinite
   desc: fillRect() with Infinity/NaN is ignored
@@ -3951,6 +4135,7 @@
     ctx.fillStyle = '#f00';
     @nonfinite ctx.fillRect(<0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <100 Infinity -Infinity NaN>, <50 Infinity -Infinity NaN>);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.basic
   desc: strokeRect works
@@ -3961,6 +4146,7 @@
     ctx.lineWidth = 50;
     ctx.strokeRect(25, 24, 50, 2);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.path
   desc: strokeRect does not affect the current path
@@ -3975,6 +4161,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.zero.1
   desc: strokeRect of 0x0 pixels draws nothing
@@ -3985,6 +4172,7 @@
     ctx.lineWidth = 250;
     ctx.strokeRect(50, 25, 0, 0);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.strokeRect.zero.2
   desc: strokeRect of 0x0 pixels draws nothing, including caps and joins
@@ -3997,6 +4185,7 @@
     ctx.lineJoin = 'round';
     ctx.strokeRect(50, 25, 0, 0);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.strokeRect.zero.3
   desc: strokeRect of Nx0 pixels draws a straight line
@@ -4007,6 +4196,7 @@
     ctx.lineWidth = 50;
     ctx.strokeRect(0, 25, 100, 0);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.zero.4
   desc: strokeRect of Nx0 pixels draws a closed line with no caps
@@ -4018,6 +4208,7 @@
     ctx.lineCap = 'round';
     ctx.strokeRect(100, 25, 100, 0);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.strokeRect.zero.5
   desc: strokeRect of Nx0 pixels draws a closed line with joins
@@ -4029,6 +4220,7 @@
     ctx.lineJoin = 'round';
     ctx.strokeRect(100, 25, 100, 0);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.negative
   desc: strokeRect of negative sizes works
@@ -4047,6 +4239,7 @@
     @assert pixel 75,12 == 0,255,0,255;
     @assert pixel 25,37 == 0,255,0,255;
     @assert pixel 75,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.transform
   desc: fillRect is affected by transforms
@@ -4059,6 +4252,7 @@
     ctx.lineWidth = 5;
     ctx.strokeRect(2.5, -2.6, 5, 0.2);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.globalalpha
   desc: strokeRect is affected by globalAlpha
@@ -4070,6 +4264,7 @@
     ctx.lineWidth = 50;
     ctx.strokeRect(25, 24, 50, 2);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.strokeRect.globalcomposite
   desc: strokeRect is not affected by globalCompositeOperation
@@ -4081,6 +4276,7 @@
     ctx.lineWidth = 50;
     ctx.strokeRect(25, 24, 50, 2);
     @assert pixel 50,25 == 0,0,0,0;
+    t.done();
 
 - name: 2d.strokeRect.clip
   desc: strokeRect is affected by clipping regions
@@ -4098,6 +4294,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 16, 16);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.shadow
   desc: strokeRect draws shadows
@@ -4115,6 +4312,7 @@
     ctx.lineWidth = 50;
     ctx.strokeRect(0, -75, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.strokeRect.nonfinite
   desc: strokeRect() with Infinity/NaN is ignored
@@ -4127,6 +4325,7 @@
     ctx.lineWidth = 150;
     @nonfinite ctx.strokeRect(<0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <100 Infinity -Infinity NaN>, <50 Infinity -Infinity NaN>);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.drawImage.3arg
@@ -4166,7 +4365,7 @@
         @assert pixel 99,0 ==~ 0,255,0,255;
         @assert pixel 0,49 ==~ 0,255,0,255;
         @assert pixel 99,49 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.5arg
   testing:
@@ -4205,7 +4404,7 @@
         @assert pixel 99,0 ==~ 0,255,0,255;
         @assert pixel 0,49 ==~ 0,255,0,255;
         @assert pixel 99,49 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.9arg.basic
   testing:
@@ -4231,7 +4430,7 @@
         @assert pixel 99,0 ==~ 0,255,0,255;
         @assert pixel 0,49 ==~ 0,255,0,255;
         @assert pixel 99,49 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.9arg.sourcepos
   testing:
@@ -4257,7 +4456,7 @@
         @assert pixel 99,0 ==~ 0,255,0,255;
         @assert pixel 0,49 ==~ 0,255,0,255;
         @assert pixel 99,49 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.9arg.sourcesize
   testing:
@@ -4290,7 +4489,7 @@
         @assert pixel 80,20 ==~ 0,255,0,255;
         @assert pixel 20,30 ==~ 0,255,0,255;
         @assert pixel 80,30 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.9arg.destpos
   testing:
@@ -4330,7 +4529,7 @@
         @assert pixel 99,0 ==~ 0,255,0,255;
         @assert pixel 0,49 ==~ 0,255,0,255;
         @assert pixel 99,49 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.9arg.destsize
   testing:
@@ -4370,7 +4569,7 @@
         @assert pixel 99,0 ==~ 0,255,0,255;
         @assert pixel 0,49 ==~ 0,255,0,255;
         @assert pixel 99,49 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.canvas
   testing:
@@ -4387,6 +4586,7 @@
     @assert pixel 99,0 ==~ 0,255,0,255;
     @assert pixel 0,49 ==~ 0,255,0,255;
     @assert pixel 99,49 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.drawImage.self.1
   testing:
@@ -4402,6 +4602,7 @@
     @assert pixel 99,0 ==~ 0,255,0,255;
     @assert pixel 0,49 ==~ 0,255,0,255;
     @assert pixel 99,49 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.drawImage.self.2
   testing:
@@ -4419,6 +4620,7 @@
     @assert pixel 99,0 ==~ 0,255,0,255;
     @assert pixel 0,49 ==~ 0,255,0,255;
     @assert pixel 99,49 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.drawImage.null
   testing:
@@ -4426,6 +4628,7 @@
   timeout: long
   code: |
     @assert throws TypeError ctx.drawImage(null, 0, 0);
+    t.done();
 
 - name: 2d.drawImage.zerocanvas
   testing:
@@ -4442,6 +4645,7 @@
     offscreenCanvas2.width = 0;
     offscreenCanvas2.height = 0;
     @assert throws INVALID_STATE_ERR ctx.drawImage(offscreenCanvas2, 0, 0);
+    t.done();
 
 - name: 2d.drawImage.wrongtype
   desc: Incorrect image types in drawImage do not match any defined overloads, so WebIDL throws a TypeError
@@ -4452,6 +4656,7 @@
     @assert throws TypeError ctx.drawImage(undefined, 0, 0);
     @assert throws TypeError ctx.drawImage(0, 0, 0);
     @assert throws TypeError ctx.drawImage("", 0, 0);
+    t.done();
 
 - name: 2d.drawImage.floatsource
   testing:
@@ -4470,7 +4675,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.zerosource
   desc: drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR
@@ -4496,7 +4701,7 @@
         @assert throws INDEX_SIZE_ERR ctx.drawImage(response, 10, 10, 1, 0, 0, 0, 100, 50);
         @assert throws INDEX_SIZE_ERR ctx.drawImage(response, 10, 10, 0, 0, 0, 0, 100, 50);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.zerosource.image
   desc: drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR
@@ -4524,7 +4729,7 @@
         @assert throws INDEX_SIZE_ERR ctx.drawImage(response, 0, 0, 100, 50);
         @assert throws INDEX_SIZE_ERR ctx.drawImage(response, 0, 0, 100, 50);
         @assert pixel 50,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.negativesource
   desc: Negative source width/height represents the correct rectangle
@@ -4559,7 +4764,7 @@
         @assert pixel 51,48 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.negativedest
   desc: Negative destination width/height represents the correct rectangle
@@ -4594,7 +4799,7 @@
         @assert pixel 51,48 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.negativedir
   desc: Negative dimensions do not affect the direction of the image
@@ -4629,7 +4834,7 @@
         @assert pixel 51,48 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.outsidesource
   DISABLED: fix this to match the current spec (transparent black outside source)
@@ -4667,7 +4872,7 @@
         @assert throws INDEX_SIZE_ERR ctx.drawImage(response1, 0, 0, 5, -5, 0, 0, 100, 50);
         @assert throws INDEX_SIZE_ERR ctx.drawImage(response1, 110, 60, -20, -20, 0, 0, 100, 50);
         @assert pixel 50,25 ==~ 0,255,0,255; @moz-todo
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.broken
   testing:
@@ -4688,7 +4893,7 @@
         ctx.fillRect(0, 0, 100, 50);
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255; @moz-todo
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.svg
   desc: drawImage() of an SVG image
@@ -4708,7 +4913,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.animated.poster
   desc: drawImage() of an APNG draws the poster frame
@@ -4730,7 +4935,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255; @moz-todo
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.path
   testing:
@@ -4752,7 +4957,7 @@
         ctx.drawImage(response, 0, 0);
         ctx.fill();
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.transform
   testing:
@@ -4776,7 +4981,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.alpha
   testing:
@@ -4800,7 +5005,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.clip
   testing:
@@ -4825,7 +5030,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.composite
   testing:
@@ -4849,7 +5054,7 @@
     promise.then(function(response) {
         ctx.drawImage(response, 0, 0);
         @assert pixel 50,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.nowrap
   desc: Stretched images do not get pixels wrapping around the edges
@@ -4873,7 +5078,7 @@
         @assert pixel 45,25 ==~ 0,255,0,255;
         @assert pixel 50,25 ==~ 0,255,0,255;
         @assert pixel 55,25 ==~ 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.drawImage.nonfinite
   desc: drawImage() with Infinity/NaN is ignored
@@ -4899,7 +5104,7 @@
         @nonfinite ctx.drawImage(<response>, <0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <100 Infinity -Infinity NaN>, <50 Infinity -Infinity NaN>);
         @nonfinite ctx.drawImage(<response>, <0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <100 Infinity -Infinity NaN>, <50 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <0 Infinity -Infinity NaN>, <100 Infinity -Infinity NaN>, <50 Infinity -Infinity NaN>);
         @assert pixel 50,25 == 0,255,0,255;
-    });
+    }).then(t_pass, t_fail);
 
 - name: 2d.imageData.create2.basic
   desc: createImageData(sw, sh) exists and returns something
@@ -4907,6 +5112,7 @@
     - 2d.imageData.create2.object
   code: |
     @assert ctx.createImageData(1, 1) !== null;
+    t.done();
 
 - name: 2d.imageData.create1.basic
   desc: createImageData(imgdata) exists and returns something
@@ -4914,6 +5120,7 @@
     - 2d.imageData.create1.object
   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
@@ -4931,6 +5138,7 @@
         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
@@ -4951,6 +5159,7 @@
         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
@@ -4966,6 +5175,7 @@
         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
@@ -4979,6 +5189,7 @@
     @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
@@ -4988,6 +5199,7 @@
     @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
@@ -4999,6 +5211,7 @@
         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
@@ -5006,6 +5219,7 @@
     - 2d.imageData.create.null
   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)
@@ -5016,6 +5230,7 @@
     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
@@ -5023,6 +5238,7 @@
     - 2d.imageData.get.basic
   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
@@ -5032,6 +5248,7 @@
     @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
@@ -5043,6 +5260,7 @@
         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
@@ -5103,6 +5321,7 @@
     @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
@@ -5128,6 +5347,7 @@
     @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
@@ -5138,6 +5358,7 @@
     var imgdata2 = ctx.getImageData(0, 0, 20, 20);
     @assert imgdata2.width > imgdata1.width;
     @assert imgdata2.height > imgdata1.height;
+    t.done();
 
 - name: 2d.imageData.get.tiny
   desc: getImageData() works for sizes smaller than one pixel
@@ -5148,6 +5369,7 @@
     @assert imgdata.data.length === imgdata.width*imgdata.height*4;
     @assert imgdata.width === 1;
     @assert imgdata.height === 1;
+    t.done();
 
 - name: 2d.imageData.get.nonpremul
   desc: getImageData() returns non-premultiplied colours
@@ -5162,6 +5384,7 @@
     @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]
@@ -5177,6 +5400,7 @@
     @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 colours to the range [0, 255]
@@ -5195,6 +5419,7 @@
     @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
@@ -5203,6 +5428,7 @@
   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
@@ -5217,6 +5443,7 @@
     @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
@@ -5231,6 +5458,7 @@
     @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
@@ -5249,6 +5477,7 @@
     @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
@@ -5260,6 +5489,7 @@
     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
@@ -5282,6 +5512,7 @@
     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
@@ -5293,6 +5524,7 @@
     @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
@@ -5313,6 +5545,7 @@
     @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
@@ -5324,6 +5557,7 @@
     @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
@@ -5334,6 +5568,7 @@
     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
@@ -5347,6 +5582,7 @@
     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
@@ -5363,6 +5599,7 @@
     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]
@@ -5394,6 +5631,7 @@
     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
@@ -5429,6 +5667,7 @@
     @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
@@ -5436,6 +5675,7 @@
     - 2d.imageData.put.wrongtype
   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
@@ -5445,6 +5685,7 @@
     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
@@ -5459,6 +5700,7 @@
     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
@@ -5476,6 +5718,7 @@
     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
@@ -5486,6 +5729,7 @@
     @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
@@ -5501,6 +5745,7 @@
     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
@@ -5514,6 +5759,7 @@
     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
@@ -5532,6 +5778,7 @@
     }
     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
@@ -5545,6 +5792,7 @@
     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
@@ -5566,6 +5814,7 @@
     @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
@@ -5587,6 +5836,7 @@
     @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
@@ -5608,6 +5858,7 @@
     @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
@@ -5630,6 +5881,7 @@
     @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
@@ -5652,6 +5904,7 @@
     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
@@ -5671,6 +5924,7 @@
     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
@@ -5688,6 +5942,7 @@
     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
@@ -5702,6 +5957,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 50,25 ==~ 0,255,0,255;
+    t.done();
 
 - name: 2d.line.defaults
   testing:
@@ -5714,6 +5970,7 @@
     @assert ctx.lineCap === 'butt';
     @assert ctx.lineJoin === 'miter';
     @assert ctx.miterLimit === 10;
+    t.done();
 
 - name: 2d.line.width.basic
   desc: lineWidth determines the width of line strokes
@@ -5753,6 +6010,7 @@
     @assert pixel 84,25 == 0,255,0,255;
     @assert pixel 85,25 == 0,255,0,255;
     @assert pixel 86,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.width.transformed
   desc: Line stroke widths are affected by scale transformations
@@ -5798,6 +6056,7 @@
     @assert pixel 84,25 == 0,255,0,255;
     @assert pixel 85,25 == 0,255,0,255;
     @assert pixel 86,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.width.scaledefault
   desc: Default lineWidth strokes are affected by scale transformations
@@ -5816,6 +6075,7 @@
     @assert pixel 75,25 == 0,255,0,255;
     @assert pixel 50,5 == 0,255,0,255;
     @assert pixel 50,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.width.valid
   desc: Setting lineWidth to valid values works
@@ -5831,6 +6091,7 @@
     @assert ctx.lineWidth === 1/1024;
     ctx.lineWidth = 1000;
     @assert ctx.lineWidth === 1000;
+    t.done();
 
 - name: 2d.line.width.invalid
   desc: Setting lineWidth to invalid values is ignored
@@ -5854,6 +6115,7 @@
     ctx.lineWidth = 1.5;
     ctx.lineWidth = NaN;
     @assert ctx.lineWidth === 1.5;
+    t.done();
 
 - name: 2d.line.cap.butt
   desc: lineCap 'butt' is rendered correctly
@@ -5890,6 +6152,7 @@
     @assert pixel 75,34 == 0,255,0,255;
     @assert pixel 75,35 == 0,255,0,255;
     @assert pixel 75,36 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.cap.round
   desc: lineCap 'round' is rendered correctly
@@ -5935,6 +6198,7 @@
     @assert pixel 67,43 == 0,255,0,255;
     @assert pixel 75,43 == 0,255,0,255;
     @assert pixel 82,43 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.cap.square
   desc: lineCap 'square' is rendered correctly
@@ -5971,6 +6235,7 @@
     @assert pixel 75,44 == 0,255,0,255;
     @assert pixel 75,45 == 0,255,0,255;
     @assert pixel 75,46 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.cap.open
   desc: Line caps are drawn at the corners of an unclosed rectangle
@@ -5994,6 +6259,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.cap.closed
   desc: Line caps are not drawn at the corners of an unclosed rectangle
@@ -6017,6 +6283,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.cap.valid
   desc: Setting lineCap to valid values works
@@ -6030,6 +6297,7 @@
     @assert ctx.lineCap === 'round';
     ctx.lineCap = 'square';
     @assert ctx.lineCap === 'square';
+    t.done();
 
 - name: 2d.line.cap.invalid
   desc: Setting lineCap to invalid values is ignored
@@ -6056,6 +6324,7 @@
     ctx.lineCap = 'butt';
     ctx.lineCap = 'bevel';
     @assert ctx.lineCap === 'butt';
+    t.done();
 
 - name: 2d.line.join.bevel
   desc: lineJoin 'bevel' is rendered correctly
@@ -6106,6 +6375,7 @@
     @assert pixel 85,15 == 0,255,0,255;
     @assert pixel 86,15 == 0,255,0,255;
     @assert pixel 86,14 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.join.round
   desc: lineJoin 'round' is rendered correctly
@@ -6153,6 +6423,7 @@
     @assert pixel 87,13 == 0,255,0,255;
     @assert pixel 88,13 == 0,255,0,255;
     @assert pixel 88,12 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.join.miter
   desc: lineJoin 'miter' is rendered correctly
@@ -6193,6 +6464,7 @@
     @assert pixel 90,10 == 0,255,0,255;
     @assert pixel 91,9 == 0,255,0,255;
     @assert pixel 92,8 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.join.open
   desc: Line joins are not drawn at the corner of an unclosed rectangle
@@ -6215,6 +6487,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.join.closed
   desc: Line joins are drawn at the corner of a closed rectangle
@@ -6237,6 +6510,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.join.parallel
   desc: Line joins are drawn at 180-degree joins
@@ -6257,6 +6531,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.join.valid
   desc: Setting lineJoin to valid values works
@@ -6270,6 +6545,7 @@
     @assert ctx.lineJoin === 'round';
     ctx.lineJoin = 'miter';
     @assert ctx.lineJoin === 'miter';
+    t.done();
 
 - name: 2d.line.join.invalid
   desc: Setting lineJoin to invalid values is ignored
@@ -6296,6 +6572,7 @@
     ctx.lineJoin = 'bevel';
     ctx.lineJoin = 'butt';
     @assert ctx.lineJoin === 'bevel';
+    t.done();
 
 - name: 2d.line.miter.exceeded
   desc: Miter joins are not drawn when the miter limit is exceeded
@@ -6318,6 +6595,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.miter.acute
   desc: Miter joins are drawn correctly with acute angles
@@ -6347,6 +6625,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.miter.obtuse
   desc: Miter joins are drawn correctly with obtuse angles
@@ -6376,6 +6655,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.miter.rightangle
   desc: Miter joins are not drawn when the miter limit is exceeded, on exact right angles
@@ -6397,6 +6677,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.miter.lineedge
   desc: Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle
@@ -6415,6 +6696,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.miter.within
   desc: Miter joins are drawn when the miter limit is not quite exceeded
@@ -6436,6 +6718,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.miter.valid
   desc: Setting miterLimit to valid values works
@@ -6451,6 +6734,7 @@
     @assert ctx.miterLimit === 1/1024;
     ctx.miterLimit = 1000;
     @assert ctx.miterLimit === 1000;
+    t.done();
 
 - name: 2d.line.miter.invalid
   desc: Setting miterLimit to invalid values is ignored
@@ -6474,6 +6758,7 @@
     ctx.miterLimit = 1.5;
     ctx.miterLimit = NaN;
     @assert ctx.miterLimit === 1.5;
+    t.done();
 
 - name: 2d.line.cross
   code: |
@@ -6491,6 +6776,7 @@
     @assert pixel 48,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.line.union
   code: |
@@ -6511,6 +6797,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 25,1 == 0,255,0,255;
     @assert pixel 48,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.initial
   testing:
@@ -6522,6 +6809,7 @@
     ctx.fillStyle = '#f00';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.beginPath
   testing:
@@ -6534,6 +6822,7 @@
     ctx.fillStyle = '#f00';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.moveTo.basic
   testing:
@@ -6549,6 +6838,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 90,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.moveTo.newsubpath
   testing:
@@ -6564,6 +6854,7 @@
     ctx.fillStyle = '#f00';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.moveTo.multiple
   testing:
@@ -6579,6 +6870,7 @@
     ctx.lineWidth = 50;
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.moveTo.nonfinite
   desc: moveTo() with Infinity/NaN is ignored
@@ -6593,6 +6885,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.closePath.empty
   testing:
@@ -6604,6 +6897,7 @@
     ctx.fillStyle = '#f00';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.closePath.newline
   testing:
@@ -6620,6 +6914,7 @@
     ctx.closePath();
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.closePath.nextpoint
   testing:
@@ -6635,6 +6930,7 @@
     ctx.lineTo(1000, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.lineTo.ensuresubpath.1
   desc: If there is no subpath, the point is added and nothing is drawn
@@ -6650,6 +6946,7 @@
     ctx.lineTo(100, 50);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.lineTo.ensuresubpath.2
   desc: If there is no subpath, the point is added and used for subsequent drawing
@@ -6666,6 +6963,7 @@
     ctx.lineTo(100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.lineTo.basic
   testing:
@@ -6680,6 +6978,7 @@
     ctx.lineTo(100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.lineTo.nextpoint
   testing:
@@ -6695,6 +6994,7 @@
     ctx.lineTo(100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.lineTo.nonfinite
   desc: lineTo() with Infinity/NaN is ignored
@@ -6710,6 +7010,7 @@
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 90,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.lineTo.nonfinite.details
   desc: lineTo() with Infinity/NaN for first arg still converts the second arg
@@ -6721,6 +7022,7 @@
       ctx.lineTo(arg1, { valueOf: function() { converted = true; return 0; } });
       @assert converted;
     }
+    t.done();
 
 - name: 2d.path.quadraticCurveTo.ensuresubpath.1
   desc: If there is no subpath, the first control point is added (and nothing is drawn up to it)
@@ -6737,6 +7039,7 @@
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 95,45 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.quadraticCurveTo.ensuresubpath.2
   desc: If there is no subpath, the first control point is added
@@ -6753,6 +7056,7 @@
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 5,45 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.quadraticCurveTo.basic
   testing:
@@ -6767,6 +7071,7 @@
     ctx.quadraticCurveTo(100, 25, 100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.quadraticCurveTo.shape
   testing:
@@ -6785,6 +7090,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.quadraticCurveTo.scaled
   testing:
@@ -6804,6 +7110,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.quadraticCurveTo.nonfinite
   desc: quadraticCurveTo() with Infinity/NaN is ignored
@@ -6819,6 +7126,7 @@
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 90,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.bezierCurveTo.ensuresubpath.1
   desc: If there is no subpath, the first control point is added (and nothing is drawn up to it)
@@ -6835,6 +7143,7 @@
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 95,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.bezierCurveTo.ensuresubpath.2
   desc: If there is no subpath, the first control point is added
@@ -6851,6 +7160,7 @@
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 5,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.bezierCurveTo.basic
   testing:
@@ -6865,6 +7175,7 @@
     ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.bezierCurveTo.shape
   testing:
@@ -6883,6 +7194,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.bezierCurveTo.scaled
   testing:
@@ -6902,6 +7214,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.bezierCurveTo.nonfinite
   desc: bezierCurveTo() with Infinity/NaN is ignored
@@ -6917,6 +7230,7 @@
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 90,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.ensuresubpath.1
   desc: If there is no subpath, the first control point is added (and nothing is drawn up to it)
@@ -6932,6 +7246,7 @@
     ctx.arcTo(100, 50, 200, 50, 0.1);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.ensuresubpath.2
   desc: If there is no subpath, the first control point is added
@@ -6948,6 +7263,7 @@
     ctx.lineTo(100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.coincide.1
   desc: arcTo() has no effect if P0 = P1
@@ -6971,6 +7287,7 @@
     @assert pixel 50,1 == 0,255,0,255;
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.coincide.2
   desc: arcTo() draws a straight line to P1 if P1 = P2
@@ -6986,6 +7303,7 @@
     ctx.arcTo(100, 25, 100, 25, 1);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.collinear.1
   desc: arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1
@@ -7006,6 +7324,7 @@
     ctx.arcTo(0, 25, 100, 25, 1);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.collinear.2
   desc: arcTo() with all points on a line, and P2 between P0/P1, draws a straight line to P1
@@ -7026,6 +7345,7 @@
     ctx.arcTo(200, 25, 110, 25, 1);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.collinear.3
   desc: arcTo() with all points on a line, and P0 between P1/P2, draws a straight line to P1
@@ -7050,6 +7370,7 @@
     ctx.arcTo(0, 25, -200, 25, 1);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.shape.curve1
   desc: arcTo() curves in the right kind of shape
@@ -7086,6 +7407,7 @@
     @assert pixel 80,45 == 0,255,0,255;
     @assert pixel 80,46 == 0,255,0,255;
     @assert pixel 65,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.shape.curve2
   desc: arcTo() curves in the right kind of shape
@@ -7121,6 +7443,7 @@
     @assert pixel 80,44 == 0,255,0,255;
     @assert pixel 80,45 == 0,255,0,255;
     @assert pixel 80,46 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.shape.start
   desc: arcTo() draws a straight line from P0 to P1
@@ -7140,6 +7463,7 @@
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.shape.end
   desc: arcTo() does not draw anything from P1 to P2
@@ -7159,6 +7483,7 @@
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.negative
   desc: arcTo() with negative radius throws an exception
@@ -7166,6 +7491,7 @@
     - 2d.path.arcTo.negative
   code: |
     @assert throws INDEX_SIZE_ERR ctx.arcTo(0, 0, 0, 0, -1);
+    t.done();
 
 - name: 2d.path.arcTo.zero.1
   desc: arcTo() with zero radius draws a straight line from P0 to P1
@@ -7186,6 +7512,7 @@
     ctx.arcTo(50, -25, 50, 50, 0);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.zero.2
   desc: arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear
@@ -7206,6 +7533,7 @@
     ctx.arcTo(200, 25, 50, 25, 0);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.transformation
   desc: arcTo joins up to the last subpath point correctly
@@ -7228,6 +7556,7 @@
     @assert pixel 0,49 == 0,255,0,255;
     @assert pixel 50,49 == 0,255,0,255;
     @assert pixel 99,49 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.scale
   desc: arcTo scales the curve, not just the control points
@@ -7251,6 +7580,7 @@
     @assert pixel 0,49 == 0,255,0,255;
     @assert pixel 50,49 == 0,255,0,255;
     @assert pixel 99,49 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arcTo.nonfinite
   desc: arcTo() with Infinity/NaN is ignored
@@ -7266,6 +7596,7 @@
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 90,45 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.path.arc.empty
@@ -7281,6 +7612,7 @@
     ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.nonempty
   desc: arc() with a non-empty path does draw a straight line to the start point
@@ -7296,6 +7628,7 @@
     ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.end
   desc: arc() adds the end point of the arc to the subpath
@@ -7312,6 +7645,7 @@
     ctx.lineTo(100, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.default
   desc: arc() with missing last argument defaults to clockwise
@@ -7326,6 +7660,7 @@
     ctx.arc(100, 0, 150, -Math.PI, Math.PI/2);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.angle.1
   desc: arc() draws pi/2 .. -pi anticlockwise correctly
@@ -7340,6 +7675,7 @@
     ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.angle.2
   desc: arc() draws -3pi/2 .. -pi anticlockwise correctly
@@ -7354,6 +7690,7 @@
     ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.angle.3
   desc: arc() wraps angles mod 2pi when anticlockwise and end > start+2pi
@@ -7368,6 +7705,7 @@
     ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.angle.4
   desc: arc() draws a full circle when clockwise and end > start+2pi
@@ -7385,6 +7723,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.angle.5
   desc: arc() wraps angles mod 2pi when clockwise and start > end+2pi
@@ -7399,6 +7738,7 @@
     ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.angle.6
   desc: arc() draws a full circle when anticlockwise and start > end+2pi
@@ -7416,6 +7756,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.zero.1
   desc: arc() draws nothing when startAngle = endAngle and anticlockwise
@@ -7430,6 +7771,7 @@
     ctx.arc(50, 25, 50, 0, 0, true);
     ctx.stroke();
     @assert pixel 50,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.zero.2
   desc: arc() draws nothing when startAngle = endAngle and clockwise
@@ -7444,6 +7786,7 @@
     ctx.arc(50, 25, 50, 0, 0, false);
     ctx.stroke();
     @assert pixel 50,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.twopie.1
   desc: arc() draws nothing when end = start + 2pi-e and anticlockwise
@@ -7458,6 +7801,7 @@
     ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true);
     ctx.stroke();
     @assert pixel 50,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.twopie.2
   desc: arc() draws a full circle when end = start + 2pi-e and clockwise
@@ -7472,6 +7816,7 @@
     ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false);
     ctx.stroke();
     @assert pixel 50,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.twopie.3
   desc: arc() draws a full circle when end = start + 2pi+e and anticlockwise
@@ -7486,6 +7831,7 @@
     ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true);
     ctx.stroke();
     @assert pixel 50,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.twopie.4
   desc: arc() draws nothing when end = start + 2pi+e and clockwise
@@ -7500,6 +7846,7 @@
     ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false);
     ctx.stroke();
     @assert pixel 50,20 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.shape.1
   desc: arc() from 0 to pi does not draw anything in the wrong half
@@ -7519,6 +7866,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 20,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.shape.2
   desc: arc() from 0 to pi draws stuff in the right half
@@ -7538,6 +7886,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 20,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.shape.3
   desc: arc() from 0 to -pi/2 does not draw anything in the wrong quadrant
@@ -7556,6 +7905,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255; @moz-todo
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.shape.4
   desc: arc() from 0 to -pi/2 draws stuff in the right quadrant
@@ -7574,6 +7924,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.shape.5
   desc: arc() from 0 to 5pi does not draw crazy things
@@ -7592,6 +7943,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.selfintersect.1
   desc: arc() with lineWidth > 2*radius is drawn sensibly
@@ -7610,6 +7962,7 @@
     ctx.stroke();
     @assert pixel 1,1 == 0,255,0,255; @moz-todo
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.selfintersect.2
   desc: arc() with lineWidth > 2*radius is drawn sensibly
@@ -7632,6 +7985,7 @@
     @assert pixel 97,2 == 0,255,0,255;
     @assert pixel 97,3 == 0,255,0,255;
     @assert pixel 2,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.negative
   desc: arc() with negative radius throws INDEX_SIZE_ERR
@@ -7639,6 +7993,7 @@
     - 2d.path.arc.negative
   code: |
     @assert throws INDEX_SIZE_ERR ctx.arc(0, 0, -1, 0, 0, true);
+    t.done();
 
 - name: 2d.path.arc.zeroradius
   desc: arc() with zero radius draws a line to the start point
@@ -7654,6 +8009,7 @@
     ctx.arc(200, 25, 0, 0, Math.PI, true);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.scale.1
   desc: Non-uniformly scaled arcs are the right shape
@@ -7687,6 +8043,7 @@
     @assert pixel 0,49 == 0,255,0,255;
     @assert pixel 50,49 == 0,255,0,255;
     @assert pixel 99,49 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.scale.2
   desc: Highly scaled arcs are the right shape
@@ -7710,6 +8067,7 @@
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 50,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.arc.nonfinite
   desc: arc() with Infinity/NaN is ignored
@@ -7727,6 +8085,7 @@
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 90,45 == 0,255,0,255;
+    t.done();
 
 
 - name: 2d.path.rect.basic
@@ -7739,6 +8098,7 @@
     ctx.rect(0, 0, 100, 50);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.newsubpath
   testing:
@@ -7754,6 +8114,7 @@
     ctx.rect(200, 25, 1, 1);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.closed
   testing:
@@ -7767,6 +8128,7 @@
     ctx.rect(100, 50, 100, 100);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.end.1
   testing:
@@ -7780,6 +8142,7 @@
     ctx.lineTo(-2000, -1000);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.end.2
   testing:
@@ -7798,6 +8161,7 @@
     @assert pixel 98,1 == 0,255,0,255;
     @assert pixel 1,48 == 0,255,0,255;
     @assert pixel 98,48 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.zero.1
   testing:
@@ -7811,6 +8175,7 @@
     ctx.rect(0, 50, 100, 0);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.zero.2
   testing:
@@ -7824,6 +8189,7 @@
     ctx.rect(50, -100, 0, 250);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.zero.3
   testing:
@@ -7837,6 +8203,7 @@
     ctx.rect(50, 25, 0, 0);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.zero.4
   testing:
@@ -7850,6 +8217,7 @@
     ctx.lineTo(0, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.zero.5
   testing:
@@ -7863,6 +8231,7 @@
     ctx.rect(100, 25, 0, 0);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.zero.6
   testing:
@@ -7878,6 +8247,7 @@
     ctx.rect(100, 25, 1000, 0);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.rect.negative
   testing:
@@ -7896,6 +8266,7 @@
     @assert pixel 75,12 == 0,255,0,255;
     @assert pixel 25,37 == 0,255,0,255;
     @assert pixel 75,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.winding
   testing:
@@ -7914,6 +8285,7 @@
     @assert pixel 75,12 == 0,255,0,255;
     @assert pixel 25,37 == 0,255,0,255;
     @assert pixel 75,37 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.rect.selfintersect
   code: |
@@ -7925,6 +8297,7 @@
     ctx.rect(45, 20, 10, 10);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.rect.nonfinite
   desc: rect() with Infinity/NaN is ignored
@@ -7940,6 +8313,7 @@
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 90,45 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.fill.overlap
   testing:
@@ -7953,6 +8327,7 @@
     ctx.rect(10, 10, 80, 30);
     ctx.fill();
     @assert pixel 50,25 ==~ 0,127,0,255 +/- 1;
+    t.done();
 
 - name: 2d.path.fill.winding.add
   testing:
@@ -7972,6 +8347,7 @@
     ctx.lineTo(0, 50);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.fill.winding.subtract.1
   testing:
@@ -7991,6 +8367,7 @@
     ctx.lineTo(100, 0);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.fill.winding.subtract.2
   testing:
@@ -8009,6 +8386,7 @@
     ctx.lineTo(100, 0);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.fill.winding.subtract.3
   testing:
@@ -8033,6 +8411,7 @@
     ctx.lineTo(100, 0);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.fill.closed.basic
   testing:
@@ -8047,6 +8426,7 @@
     ctx.lineTo(0, 50);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.fill.closed.unaffected
   testing:
@@ -8064,6 +8444,7 @@
     ctx.fill();
     @assert pixel 90,10 == 0,255,0,255;
     @assert pixel 10,40 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.overlap
   desc: Stroked subpaths are combined before being drawn
@@ -8080,6 +8461,7 @@
     ctx.lineTo(100, 30);
     ctx.stroke();
     @assert pixel 50,25 ==~ 0,127,0,255 +/- 1;
+    t.done();
 
 - name: 2d.path.stroke.union
   desc: Strokes in opposite directions are unioned, not subtracted
@@ -8096,6 +8478,7 @@
     ctx.lineTo(0, 40);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.unaffected
   desc: Stroking does not start a new path or subpath
@@ -8115,6 +8498,7 @@
     ctx.strokeStyle = '#0f0';
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.scale1
   desc: Stroke line widths are scaled by the current transformation matrix
@@ -8146,6 +8530,7 @@
     @assert pixel 0,49 == 0,255,0,255;
     @assert pixel 50,49 == 0,255,0,255;
     @assert pixel 99,49 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.scale2
   desc: Stroke line widths are scaled by the current transformation matrix
@@ -8179,6 +8564,7 @@
     @assert pixel 0,49 == 0,255,0,255;
     @assert pixel 50,49 == 0,255,0,255;
     @assert pixel 99,49 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.skew
   desc: Strokes lines are skewed by the current transformation matrix
@@ -8225,6 +8611,7 @@
     @assert pixel 0,49 == 0,255,0,255;
     @assert pixel 50,49 == 0,255,0,255;
     @assert pixel 99,49 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.empty
   desc: Empty subpaths are not stroked
@@ -8242,6 +8629,7 @@
     ctx.moveTo(60, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.stroke.prune.line
   desc: Zero-length line segments from lineTo are removed before stroking
@@ -8259,6 +8647,7 @@
     ctx.lineTo(50, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.stroke.prune.closed
   desc: Zero-length line segments from closed paths are removed before stroking
@@ -8277,6 +8666,7 @@
     ctx.closePath();
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.stroke.prune.curve
   desc: Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking
@@ -8298,6 +8688,7 @@
     ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.stroke.prune.arc
   desc: Zero-length line segments from arcTo and arc are removed before stroking
@@ -8319,6 +8710,7 @@
     ctx.arc(50, 25, 10, 0, 0, false);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.stroke.prune.rect
   desc: Zero-length line segments from rect and strokeRect are removed before stroking
@@ -8336,6 +8728,7 @@
     ctx.stroke();
     ctx.strokeRect(50, 25, 0, 0);
     @assert pixel 50,25 == 0,255,0,255; @moz-todo
+    t.done();
 
 - name: 2d.path.stroke.prune.corner
   desc: Zero-length line segments are removed before stroking with miters
@@ -8356,6 +8749,7 @@
     ctx.lineTo(-100, 1000);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.transformation.basic
   testing:
@@ -8369,6 +8763,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.transformation.multiple
   desc: Transformations are applied while building paths, not when drawing
@@ -8393,6 +8788,7 @@
     ctx.translate(0, 50);
     ctx.stroke();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.transformation.changing
   desc: Transformations are applied while building paths, not when drawing
@@ -8414,6 +8810,7 @@
     ctx.scale(0.1, 0.1);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.empty
   testing:
@@ -8426,6 +8823,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.basic.1
   testing:
@@ -8439,6 +8837,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.basic.2
   testing:
@@ -8452,6 +8851,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.intersect
   testing:
@@ -8468,6 +8868,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.winding.1
   testing:
@@ -8489,6 +8890,7 @@
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.winding.2
   testing:
@@ -8513,6 +8915,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.clip.unaffected
   testing:
@@ -8530,6 +8933,7 @@
     ctx.lineTo(0, 0);
     ctx.fill();
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: 2d.path.isPointInPath.basic.1
   desc: isPointInPath() detects whether the point is inside the path
@@ -8539,6 +8943,7 @@
     ctx.rect(0, 0, 20, 20);
     @assert ctx.isPointInPath(10, 10) === true;
     @assert ctx.isPointInPath(30, 10) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.basic.2
   desc: isPointInPath() detects whether the point is inside the path
@@ -8548,6 +8953,7 @@
     ctx.rect(20, 0, 20, 20);
     @assert ctx.isPointInPath(10, 10) === false;
     @assert ctx.isPointInPath(30, 10) === true;
+    t.done();
 
 - name: 2d.path.isPointInPath.edge
   desc: isPointInPath() counts points on the path as being inside
@@ -8567,6 +8973,7 @@
     @assert ctx.isPointInPath(10, 20.01) === false;
     @assert ctx.isPointInPath(-0.01, 10) === false;
     @assert ctx.isPointInPath(20.01, 10) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.empty
   desc: isPointInPath() works when there is no path
@@ -8574,6 +8981,7 @@
     - 2d.path.isPointInPath
   code: |
     @assert ctx.isPointInPath(0, 0) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.subpath
   desc: isPointInPath() uses the current path, not just the subpath
@@ -8588,6 +8996,7 @@
     @assert ctx.isPointInPath(10, 10) === false;
     @assert ctx.isPointInPath(30, 10) === true;
     @assert ctx.isPointInPath(50, 10) === true;
+    t.done();
 
 - name: 2d.path.isPointInPath.outside
   desc: isPointInPath() works on paths outside the canvas
@@ -8602,6 +9011,7 @@
     @assert ctx.isPointInPath(30, -20) === false;
     @assert ctx.isPointInPath(30, 0) === true;
     @assert ctx.isPointInPath(30, 20) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.unclosed
   desc: isPointInPath() works on unclosed subpaths
@@ -8614,6 +9024,7 @@
     ctx.lineTo(0, 20);
     @assert ctx.isPointInPath(10, 10) === true;
     @assert ctx.isPointInPath(30, 10) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.arc
   desc: isPointInPath() works on arcs
@@ -8629,6 +9040,7 @@
     @assert ctx.isPointInPath(70, 20) === false;
     @assert ctx.isPointInPath(30, 30) === false;
     @assert ctx.isPointInPath(70, 30) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.bigarc
   desc: isPointInPath() works on unclosed arcs larger than 2pi
@@ -8645,6 +9057,7 @@
     @assert ctx.isPointInPath(70, 20) === false;
     @assert ctx.isPointInPath(30, 30) === false;
     @assert ctx.isPointInPath(70, 30) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.bezier
   desc: isPointInPath() works on Bezier curves
@@ -8673,6 +9086,7 @@
     @assert ctx.isPointInPath(70, 30) === true;
     @assert ctx.isPointInPath(75, 20) === false;
     @assert ctx.isPointInPath(75, 30) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.winding
   desc: isPointInPath() uses the non-zero winding number rule
@@ -8699,6 +9113,7 @@
     @assert ctx.isPointInPath(5, 45) === true;
     @assert ctx.isPointInPath(25, 45) === true;
     @assert ctx.isPointInPath(45, 45) === true;
+    t.done();
 
 - name: 2d.path.isPointInPath.transform.1
   desc: isPointInPath() handles transformations correctly
@@ -8713,6 +9128,7 @@
     @assert ctx.isPointInPath(51, 10) === true;
     @assert ctx.isPointInPath(69, 10) === true;
     @assert ctx.isPointInPath(71, 10) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.transform.2
   desc: isPointInPath() handles transformations correctly
@@ -8727,6 +9143,7 @@
     @assert ctx.isPointInPath(51, 10) === true;
     @assert ctx.isPointInPath(69, 10) === true;
     @assert ctx.isPointInPath(71, 10) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.transform.3
   desc: isPointInPath() handles transformations correctly
@@ -8741,6 +9158,7 @@
     @assert ctx.isPointInPath(51, 10) === true;
     @assert ctx.isPointInPath(69, 10) === true;
     @assert ctx.isPointInPath(71, 10) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.transform.4
   desc: isPointInPath() handles transformations correctly
@@ -8753,6 +9171,7 @@
     @assert ctx.isPointInPath(60, 10) === false;
     @assert ctx.isPointInPath(110, 10) === true;
     @assert ctx.isPointInPath(110, 60) === false;
+    t.done();
 
 - name: 2d.path.isPointInPath.nonfinite
   desc: isPointInPath() returns false for non-finite arguments
@@ -8767,6 +9186,7 @@
     @assert ctx.isPointInPath(0, -Infinity) === false;
     @assert ctx.isPointInPath(0, NaN) === false;
     @assert ctx.isPointInPath(NaN, NaN) === false;
+    t.done();
 
 - name: 2d.coordinatespace
   desc: Coordinate space goes from top-left to bottom-right
@@ -8782,6 +9202,7 @@
     @assert pixel 75,12 == 0,0,255,255;
     @assert pixel 25,37 == 0,0,255,255;
     @assert pixel 75,37 == 0,0,255,255;
+    t.done();
 
 - name: 2d.missingargs
   desc: Missing arguments cause TypeError
@@ -8882,6 +9303,7 @@
     var g = ctx.createLinearGradient(0, 0, 0, 0);
     @assert throws TypeError g.addColorStop(); @moz-todo
     @assert throws TypeError g.addColorStop(0); @moz-todo
+    t.done();
 
 - name: 2d.voidreturn
   desc: void methods return undefined
@@ -8917,6 +9339,7 @@
     }
     @assert ctx.drawImage(offscreenCanvas, 0, 0, 1, 1, 0, 0, 0, 0) === undefined;
     @assert ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white') === undefined;
+    t.done();
 
 - name: 2d.canvas.reference
   desc: canvas refers back to its canvas
@@ -8924,6 +9347,7 @@
     - 2d.canvas
   code: |
     @assert ctx.canvas === offscreenCanvas;
+    t.done();
 
 - name: 2d.canvas.readonly
   desc: canvas is readonly
@@ -8935,6 +9359,7 @@
     @assert offscreenCanvas2 !== d;
     ctx.canvas = offscreenCanvas2;
     @assert ctx.canvas === d;
+    t.done();
 
 - name: 2d.getcontext.exists
   desc: The 2D context is implemented
@@ -8943,6 +9368,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert offscreenCanvas2.getContext('2d') !== null;
+    t.done();
 
 - name: 2d.getcontext.extraargs
   desc: The 2D context ignores extra getContext arguments
@@ -8951,6 +9377,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert offscreenCanvas2.getContext('2d', false, {}, [], 1, "2") !== null;
+    t.done();
 
 - name: 2d.getcontext.unique
   desc: getContext('2d') returns the same object
@@ -8959,6 +9386,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert offscreenCanvas2.getContext('2d') === offscreenCanvas2.getContext('2d');
+    t.done();
 
 - name: 2d.getcontext.shared
   desc: getContext('2d') returns objects which share canvas state
@@ -8970,6 +9398,7 @@
     ctx2.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: context.emptystring
   desc: getContext with empty string returns null
@@ -8978,6 +9407,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("");
+    t.done();
 
 - name: context.unrecognised.badname
   desc: getContext with unrecognised context name returns null
@@ -8986,6 +9416,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext('This is not an implemented context in any real browser');
+    t.done();
 
 - name: context.unrecognised.badsuffix
   desc: Context name "2d" plus a suffix is unrecognised
@@ -8994,6 +9425,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("2d#");
+    t.done();
 
 - name: context.unrecognised.nullsuffix
   desc: Context name "2d" plus a "\0" suffix is unrecognised
@@ -9002,6 +9434,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("2d\0");
+    t.done();
 
 - name: context.unrecognised.unicode
   desc: Context name which kind of looks like "2d" is unrecognised
@@ -9010,6 +9443,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("2\uFF44");
+    t.done();
 
 - name: context.casesensitive
   desc: Context name "2D" is unrecognised; matching is case sensitive
@@ -9018,6 +9452,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext('2D');
+    t.done();
 
 - name: context.arguments.missing
   testing:
@@ -9025,6 +9460,7 @@
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext(); @moz-todo
+    t.done();
 
 
 - name: initial.colour
@@ -9033,6 +9469,7 @@
     - initial.colour
   code: |
     @assert pixel 20,20 == 0,0,0,0;
+    t.done();
 
 - name: initial.reset.different
   desc: Changing size resets canvas to transparent black
@@ -9044,6 +9481,7 @@
     @assert pixel 20,20 == 255,0,0,255;
     offscreenCanvas.width = 50;
     @assert pixel 20,20 == 0,0,0,0;
+    t.done();
 
 - name: initial.reset.same
   desc: Setting size (not changing the value) resets canvas to transparent black
@@ -9056,6 +9494,7 @@
     @assert pixel 20,20 == 255,0,0,255;
     offscreenCanvas.width = 100;
     @assert pixel 20,20 == 0,0,0,0;
+    t.done();
 
 - name: initial.reset.path
   desc: Resetting the canvas state resets the current path
@@ -9068,6 +9507,7 @@
     ctx.fillStyle = '#f00';
     ctx.fill();
     @assert pixel 20,20 == 0,0,0,0;
+    t.done();
 
 - name: initial.reset.clip
   desc: Resetting the canvas state resets the current clip region
@@ -9081,6 +9521,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 20,20 == 0,255,0,255;
+    t.done();
 
 - name: initial.reset.transform
   desc: Resetting the canvas state resets the current transformation matrix
@@ -9093,6 +9534,7 @@
     ctx.fillStyle = '#0f0';
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 20,20 == 0,255,0,255;
+    t.done();
 
 - name: initial.reset.gradient
   desc: Resetting the canvas state does not invalidate any existing gradients
@@ -9109,6 +9551,7 @@
     ctx.fillStyle = g;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: initial.reset.pattern
   desc: Resetting the canvas state does not invalidate any existing patterns
@@ -9125,6 +9568,7 @@
     ctx.fillStyle = p;
     ctx.fillRect(0, 0, 100, 50);
     @assert pixel 50,25 == 0,255,0,255;
+    t.done();
 
 - name: size.attributes.idl.set.zero
   desc: Setting width/height IDL attributes to 0
@@ -9136,6 +9580,7 @@
     offscreenCanvas.height = 0;
     @assert offscreenCanvas.width === 0;
     @assert offscreenCanvas.height === 0;
+    t.done();
 
 - name: size.attributes.idl
   desc: Getting/setting width/height IDL attributes
@@ -9161,6 +9606,7 @@
     offscreenCanvas.height = "foo";
     @assert offscreenCanvas.width === 0;
     @assert offscreenCanvas.height === 0;
+    t.done();
 
 - name: size.attributes.default
   desc: Default width/height when attributes are missing
@@ -9170,6 +9616,7 @@
   code: |
     @assert offscreenCanvas.width === 100;
     @assert offscreenCanvas.height === 50;
+    t.done();
 
 - name: size.attributes.reflect.setidl
   desc: Setting IDL attributes updates IDL and content attributes
@@ -9180,6 +9627,7 @@
     offscreenCanvas.height = 60;
     @assert offscreenCanvas.width === 120;
     @assert offscreenCanvas.height === 60;
+    t.done();
 
 - name: size.attributes.reflect.setidlzero
   desc: Setting IDL attributes to 0 updates IDL and content attributes
@@ -9190,6 +9638,7 @@
     offscreenCanvas.height = 0;
     @assert offscreenCanvas.width === 0;
     @assert offscreenCanvas.height === 0;
+    t.done();
 
 - meta: |
     cases = [
@@ -9221,6 +9670,8 @@
             code += "@assert offscreenCanvas.width === %s;\n@assert offscreenCanvas.height === %s;\n" % (exp, exp)
             expected = None
 
+        code += "t.done();\n"
+
         if exp == 0:
             expected = None # can't generate zero-sized PNGs for the expected image
 
@@ -9247,6 +9698,7 @@
     offscreenCanvas.height = n;
     @assert offscreenCanvas.width === n;
     @assert offscreenCanvas.height === n;
+    t.done();
 
 - name: 2d.text.font.parse.basic
   testing:
@@ -9258,6 +9710,7 @@
 
     ctx.font = '20PX   SERIF';
     @assert ctx.font === '20px serif'; @moz-todo
+    t.done();
 
 - name: 2d.text.font.parse.tiny
   testing:
@@ -9266,6 +9719,7 @@
   code: |
     ctx.font = '1px sans-serif';
     @assert ctx.font === '1px sans-serif';
+    t.done();
 
 - name: 2d.text.font.parse.complex
   testing:
@@ -9275,6 +9729,7 @@
   code: |
     ctx.font = 'small-caps italic 400 12px/2 Unknown Font, sans-serif';
     @assert ctx.font === 'italic small-caps 12px "Unknown Font", sans-serif'; @moz-todo
+    t.done();
 
   # TODO:
   #   2d.text.font.parse.size.absolute
@@ -9295,6 +9750,7 @@
   code: |
     ctx.font = 'message-box';
     @assert ctx.font !== 'message-box';
+    t.done();
 
 - name: 2d.text.font.parse.invalid
   testing:
@@ -9334,12 +9790,14 @@
     ctx.font = '20px serif';
     ctx.font = '1em serif; background: green; margin: 10px';
     @assert ctx.font === '20px serif';
+    t.done();
 
 - name: 2d.text.font.default
   testing:
     - 2d.text.font.default
   code: |
     @assert ctx.font === '10px sans-serif';
+    t.done();
 
 - name: 2d.text.font.relative_size
   testing:
@@ -9347,6 +9805,7 @@
   code: |
     ctx.font = '1em sans-serif';
     @assert ctx.font === '10px sans-serif';
+    t.done();
 
 - name: 2d.text.align.valid
   testing:
@@ -9367,6 +9826,7 @@
 
     ctx.textAlign = 'center';
     @assert ctx.textAlign === 'center';
+    t.done();
 
 - name: 2d.text.align.invalid
   testing:
@@ -9387,12 +9847,14 @@
     ctx.textAlign = 'start';
     ctx.textAlign = 'end\0';
     @assert ctx.textAlign === 'start';
+    t.done();
 
 - name: 2d.text.align.default
   testing:
     - 2d.text.align.default
   code: |
     @assert ctx.textAlign === 'start';
+    t.done();
 
 
 - name: 2d.text.baseline.valid
@@ -9417,6 +9879,7 @@
 
     ctx.textBaseline = 'bottom';
     @assert ctx.textBaseline === 'bottom';
+    t.done();
 
 - name: 2d.text.baseline.invalid
   testing:
@@ -9437,12 +9900,14 @@
     ctx.textBaseline = 'top';
     ctx.textBaseline = 'middle\0';
     @assert ctx.textBaseline === 'top';
+    t.done();
 
 - name: 2d.text.baseline.default
   testing:
     - 2d.text.baseline.default
   code: |
     @assert ctx.textBaseline === 'alphabetic';
+    t.done();
 
 - name: 2d.text.draw.fill.basic
   desc: fillText draws filled text
@@ -9457,6 +9922,7 @@
     ctx.strokeStyle = '#f00';
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('PASS', 5, 35);
+    t.done();
   expected: &passfill |
     size 100 50
     cr.set_source_rgb(0, 0, 0)
@@ -9490,6 +9956,7 @@
 
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 5,45 == 0,255,0,255;
+    t.done();
   expected: green
 
 - name: 2d.text.draw.fill.rtl
@@ -9504,6 +9971,7 @@
     ctx.strokeStyle = '#f00';
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('\u202eFAIL \xa0 \xa0 SSAP', 5, 35);
+    t.done();
   expected: *passfill
 
 - name: 2d.text.draw.fill.maxWidth.large
@@ -9517,6 +9985,7 @@
     ctx.fillStyle = '#0f0';
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('PASS', 5, 35, 200);
+    t.done();
   expected: *passfill
 
 - name: 2d.text.draw.fill.maxWidth.small
@@ -9530,6 +9999,7 @@
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('fail fail fail fail fail', -100, 35, 90);
     _assertGreen(ctx, 100, 50);
+    t.done();
   expected: green
 
 - name: 2d.text.draw.fill.maxWidth.zero
@@ -9543,6 +10013,7 @@
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('fail fail fail fail fail', 5, 35, 0);
     _assertGreen(ctx, 100, 50);
+    t.done();
   expected: green
 
 - name: 2d.text.draw.fill.maxWidth.negative
@@ -9556,6 +10027,7 @@
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('fail fail fail fail fail', 5, 35, -1);
     _assertGreen(ctx, 100, 50);
+    t.done();
   expected: green
 
 - name: 2d.text.draw.fill.maxWidth.NaN
@@ -9569,6 +10041,7 @@
     ctx.font = '35px Arial, sans-serif';
     ctx.fillText('fail fail fail fail fail', 5, 35, NaN);
     _assertGreen(ctx, 100, 50);
+    t.done();
   expected: green
 
 - name: 2d.text.draw.stroke.basic
@@ -9585,6 +10058,7 @@
     ctx.lineWidth = 1;
     ctx.font = '35px Arial, sans-serif';
     ctx.strokeText('PASS', 5, 35);
+    t.done();
   expected: |
     size 100 50
     cr.set_source_rgb(0, 0, 0)
@@ -9620,6 +10094,7 @@
 
     @assert pixel 50,25 == 0,255,0,255;
     @assert pixel 5,45 == 0,255,0,255;
+    t.done();
   expected: green
 
 - name: 2d.text.draw.kern.consistent
@@ -9638,6 +10113,7 @@
     ctx.fillText('ToToToToToToTo', -50, 45);
     ctx.strokeText('VAVAVAVAVAVAVA', -50, 25);
     ctx.strokeText('ToToToToToToTo', -50, 45);
+    t.done();
   expected: green
 
 # CanvasTest is:
@@ -9663,8 +10139,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#0f0';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#f00';
@@ -9673,7 +10149,7 @@
         @assert pixel 95,5 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.fill.maxWidth.bound
@@ -9684,8 +10160,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9694,7 +10170,7 @@
         @assert pixel 95,5 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.fontface
@@ -9704,8 +10180,8 @@
     - CanvasTest
   code: |
     ctx.font = '67px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9714,7 +10190,7 @@
         @assert pixel 95,5 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.fontface.repeat
@@ -9730,14 +10206,14 @@
     ctx.font = '67px CanvasTest';
     ctx.fillStyle = '#0f0';
     ctx.fillText('AA', 0, 50);
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillText('AA', 0, 50);
         @assert pixel 5,5 ==~ 0,255,0,255;
         @assert pixel 95,5 ==~ 0,255,0,255;
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.fontface.notinpage
@@ -9749,8 +10225,8 @@
   fonthack: 0
   code: |
     ctx.font = '67px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9759,7 +10235,7 @@
         @assert pixel 95,5 ==~ 0,255,0,255; @moz-todo
         @assert pixel 25,25 ==~ 0,255,0,255; @moz-todo
         @assert pixel 75,25 ==~ 0,255,0,255; @moz-todo
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.baseline.top
@@ -9770,8 +10246,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9783,7 +10259,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.baseline.bottom
@@ -9794,8 +10270,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9807,7 +10283,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.baseline.middle
@@ -9818,8 +10294,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9831,7 +10307,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.baseline.alphabetic
@@ -9841,8 +10317,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9854,7 +10330,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.baseline.ideographic
@@ -9864,8 +10340,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9877,7 +10353,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255; @moz-todo
         @assert pixel 95,45 ==~ 0,255,0,255; @moz-todo
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.baseline.hanging
@@ -9887,8 +10363,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9900,7 +10376,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.left
@@ -9911,8 +10387,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9924,7 +10400,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.right
@@ -9935,8 +10411,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9948,7 +10424,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.start.ltr
@@ -9960,8 +10436,8 @@
   canvas: width="100" height="50" dir="ltr"
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9973,7 +10449,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.start.rtl
@@ -9986,8 +10462,8 @@
   canvas: width="100" height="50" dir="rtl"
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -9999,7 +10475,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.end.ltr
@@ -10011,8 +10487,8 @@
   canvas: width="100" height="50" dir="ltr"
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -10024,7 +10500,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.end.rtl
@@ -10037,8 +10513,8 @@
   canvas: width="100" height="50" dir="rtl"
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -10050,7 +10526,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.align.center
@@ -10061,8 +10537,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -10074,7 +10550,7 @@
         @assert pixel 75,25 ==~ 0,255,0,255;
         @assert pixel 5,45 ==~ 0,255,0,255;
         @assert pixel 95,45 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 
@@ -10086,15 +10562,15 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
         ctx.fillText('E EE', -100, 37.5);
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.space.collapse.space
@@ -10105,15 +10581,15 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
         ctx.fillText('E  EE', -100, 37.5);
         @assert pixel 25,25 ==~ 0,255,0,255; @moz-todo
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.space.collapse.other
@@ -10124,15 +10600,15 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
         ctx.fillText('E \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dEE', -100, 37.5);
         @assert pixel 25,25 ==~ 0,255,0,255; @moz-todo
         @assert pixel 75,25 ==~ 0,255,0,255; @moz-todo
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.space.collapse.nonspace
@@ -10143,15 +10619,15 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
         ctx.fillText('E\x0b EE', -150, 37.5);
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.space.collapse.start
@@ -10162,15 +10638,15 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
         ctx.fillText(' EE', 0, 37.5);
         @assert pixel 25,25 ==~ 0,255,0,255; @moz-todo
         @assert pixel 75,25 ==~ 0,255,0,255;
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.draw.space.collapse.end
@@ -10181,8 +10657,8 @@
     - CanvasTest
   code: |
     ctx.font = '50px CanvasTest';
-    deferTest();
-    step_timeout(t.step_func_done(function () {
+    new Promise(function(resolve) { step_timeout(resolve, 500); })
+      .then(function() {
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -10190,7 +10666,7 @@
         ctx.fillText('EE ', 100, 37.5);
         @assert pixel 25,25 ==~ 0,255,0,255;
         @assert pixel 75,25 ==~ 0,255,0,255; @moz-todo
-    }), 500);
+      }).then(t_pass, t_fail);
   expected: green
 
 - name: 2d.text.measure.width.basic
@@ -10200,21 +10676,20 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            @assert ctx.measureText('A').width === 50;
-            @assert ctx.measureText('AA').width === 100;
-            @assert ctx.measureText('ABCD').width === 200;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        @assert ctx.measureText('A').width === 50;
+        @assert ctx.measureText('AA').width === 100;
+        @assert ctx.measureText('ABCD').width === 200;
 
-            ctx.font = '100px CanvasTest';
-            @assert ctx.measureText('A').width === 100;
-        }), 500);
-    });
+        ctx.font = '100px CanvasTest';
+        @assert ctx.measureText('A').width === 100;
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.width.empty
   desc: The empty string has zero width for OffscreenCanvas
@@ -10223,16 +10698,15 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            @assert ctx.measureText("").width === 0;
-        }), 500);
-    });
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        @assert ctx.measureText("").width === 0;
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.width.space
   desc: Space characters are converted to U+0020 and collapsed (per CSS) for OffscreenCanvas
@@ -10241,22 +10715,21 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            @assert ctx.measureText('A B').width === 150;
-            @assert ctx.measureText('A  B').width === 150; @moz-todo
-            @assert ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width === 150; @moz-todo
-            @assert ctx.measureText('A \x0b B').width >= 200;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        @assert ctx.measureText('A B').width === 150;
+        @assert ctx.measureText('A  B').width === 150; @moz-todo
+        @assert ctx.measureText('A \x09\x0a\x0c\x0d  \x09\x0a\x0c\x0dB').width === 150; @moz-todo
+        @assert ctx.measureText('A \x0b B').width >= 200;
 
-            @assert ctx.measureText(' AB').width === 100; @moz-todo
-            @assert ctx.measureText('AB ').width === 100; @moz-todo
-        }), 500);
-    });
+        @assert ctx.measureText(' AB').width === 100; @moz-todo
+        @assert ctx.measureText('AB ').width === 100; @moz-todo
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.advances
   desc: Testing width advances for OffscreenCanvas
@@ -10265,31 +10738,30 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            ctx.direction = 'ltr';
-            ctx.align = 'left'
-            // Some platforms may return '-0'.
-            @assert Math.abs(ctx.measureText('Hello').advances[0]) === 0;
-            // Different platforms may render text slightly different.
-            @assert ctx.measureText('Hello').advances[1] >= 36;
-            @assert ctx.measureText('Hello').advances[2] >= 58;
-            @assert ctx.measureText('Hello').advances[3] >= 70;
-            @assert ctx.measureText('Hello').advances[4] >= 80;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        ctx.direction = 'ltr';
+        ctx.align = 'left'
+        // Some platforms may return '-0'.
+        @assert Math.abs(ctx.measureText('Hello').advances[0]) === 0;
+        // Different platforms may render text slightly different.
+        @assert ctx.measureText('Hello').advances[1] >= 36;
+        @assert ctx.measureText('Hello').advances[2] >= 58;
+        @assert ctx.measureText('Hello').advances[3] >= 70;
+        @assert ctx.measureText('Hello').advances[4] >= 80;
 
-            var tm = ctx.measureText('Hello');
-            @assert ctx.measureText('Hello').advances[0] === tm.advances[0];
-            @assert ctx.measureText('Hello').advances[1] === tm.advances[1];
-            @assert ctx.measureText('Hello').advances[2] === tm.advances[2];
-            @assert ctx.measureText('Hello').advances[3] === tm.advances[3];
-            @assert ctx.measureText('Hello').advances[4] === tm.advances[4];
-        }), 500);
-    });
+        var tm = ctx.measureText('Hello');
+        @assert ctx.measureText('Hello').advances[0] === tm.advances[0];
+        @assert ctx.measureText('Hello').advances[1] === tm.advances[1];
+        @assert ctx.measureText('Hello').advances[2] === tm.advances[2];
+        @assert ctx.measureText('Hello').advances[3] === tm.advances[3];
+        @assert ctx.measureText('Hello').advances[4] === tm.advances[4];
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.actualBoundingBox
   desc: Testing actualBoundingBox for OffscreenCanvas
@@ -10298,29 +10770,28 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            ctx.direction = 'ltr';
-            ctx.align = 'left'
-            ctx.baseline = 'alphabetic'
-            // Some platforms may return '-0'.
-            @assert Math.abs(ctx.measureText('A').actualBoundingBoxLeft) === 0;
-            // Different platforms may render text slightly different.
-            @assert ctx.measureText('A').actualBoundingBoxRight >= 50;
-            @assert ctx.measureText('A').actualBoundingBoxAscent >= 35;
-            @assert Math.abs(ctx.measureText('A').actualBoundingBoxDescent) === 0;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        ctx.direction = 'ltr';
+        ctx.align = 'left'
+        ctx.baseline = 'alphabetic'
+        // Some platforms may return '-0'.
+        @assert Math.abs(ctx.measureText('A').actualBoundingBoxLeft) === 0;
+        // Different platforms may render text slightly different.
+        @assert ctx.measureText('A').actualBoundingBoxRight >= 50;
+        @assert ctx.measureText('A').actualBoundingBoxAscent >= 35;
+        @assert Math.abs(ctx.measureText('A').actualBoundingBoxDescent) === 0;
 
-            @assert Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) === 0;
-            @assert ctx.measureText('ABCD').actualBoundingBoxRight >= 200;
-            @assert ctx.measureText('ABCD').actualBoundingBoxAscent >= 85;
-            @assert ctx.measureText('ABCD').actualBoundingBoxDescent >= 37;
-        }), 500);
-    });
+        @assert Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) === 0;
+        @assert ctx.measureText('ABCD').actualBoundingBoxRight >= 200;
+        @assert ctx.measureText('ABCD').actualBoundingBoxAscent >= 85;
+        @assert ctx.measureText('ABCD').actualBoundingBoxDescent >= 37;
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.fontBoundingBox
   desc: Testing fontBoundingBox for OffscreenCanvas
@@ -10329,22 +10800,21 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            ctx.direction = 'ltr';
-            ctx.align = 'left'
-            @assert ctx.measureText('A').fontBoundingBoxAscent === 85;
-            @assert ctx.measureText('A').fontBoundingBoxDescent === 39;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        ctx.direction = 'ltr';
+        ctx.align = 'left'
+        @assert ctx.measureText('A').fontBoundingBoxAscent === 85;
+        @assert ctx.measureText('A').fontBoundingBoxDescent === 39;
 
-            @assert ctx.measureText('ABCD').fontBoundingBoxAscent === 85;
-            @assert ctx.measureText('ABCD').fontBoundingBoxDescent === 39;
-        }), 500);
-    });
+        @assert ctx.measureText('ABCD').fontBoundingBoxAscent === 85;
+        @assert ctx.measureText('ABCD').fontBoundingBoxDescent === 39;
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.emHeights
   desc: Testing emHeights for OffscreenCanvas
@@ -10353,24 +10823,23 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            ctx.direction = 'ltr';
-            ctx.align = 'left'
-            @assert ctx.measureText('A').emHeightAscent === 37.5;
-            @assert ctx.measureText('A').emHeightDescent === 12.5;
-            @assert ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent === 50;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+        ctx.font = '50px CanvasTest';
+        ctx.direction = 'ltr';
+        ctx.align = 'left'
+        @assert ctx.measureText('A').emHeightAscent === 37.5;
+        @assert ctx.measureText('A').emHeightDescent === 12.5;
+        @assert ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent === 50;
 
-            @assert ctx.measureText('ABCD').emHeightAscent === 37.5;
-            @assert ctx.measureText('ABCD').emHeightDescent === 12.5;
-            @assert ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent === 50;
-        }), 500);
-    });
+        @assert ctx.measureText('ABCD').emHeightAscent === 37.5;
+        @assert ctx.measureText('ABCD').emHeightDescent === 12.5;
+        @assert ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent === 50;
+    }).then(t_pass, t_fail);
 
 - name: 2d.text.measure.baselines
   desc: Testing baselines for OffscreenCanvas
@@ -10379,23 +10848,22 @@
   fonts:
     - CanvasTest
   code: |
-    deferTest();
     var f = new FontFace("CanvasTest", "/fonts/CanvasTest.ttf");
     let fonts = (self.fonts ? self.fonts : document.fonts);
     fonts.add(f);
     fonts.ready.then(() => {
-        step_timeout(t.step_func_done(function () {
-            ctx.font = '50px CanvasTest';
-            ctx.direction = 'ltr';
-            ctx.align = 'left'
-            @assert Math.abs(ctx.measureText('A').getBaselines().alphabetic) === 0;
-            @assert ctx.measureText('A').getBaselines().ideographic === -39;
-            @assert ctx.measureText('A').getBaselines().hanging === 68;
+        return new Promise(function(resolve) { step_timeout(resolve, 500); });
+    }).then(function() {
+       ctx.font = '50px CanvasTest';
+       ctx.direction = 'ltr';
+       ctx.align = 'left'
+       @assert Math.abs(ctx.measureText('A').getBaselines().alphabetic) === 0;
+       @assert ctx.measureText('A').getBaselines().ideographic === -39;
+       @assert ctx.measureText('A').getBaselines().hanging === 68;
 
-            @assert Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic) === 0;
-            @assert ctx.measureText('ABCD').getBaselines().ideographic === -39;
-            @assert ctx.measureText('ABCD').getBaselines().hanging === 68;
-        }), 500);
-    });
+       @assert Math.abs(ctx.measureText('ABCD').getBaselines().alphabetic) === 0;
+       @assert ctx.measureText('ABCD').getBaselines().ideographic === -39;
+       @assert ctx.measureText('ABCD').getBaselines().hanging === 68;
+    }).then(t_pass, t_fail);
 
 # TODO: shadows, alpha, composite, clip
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.html
index 8d70442f108..aed92bf5cbb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Transformations are applied in the right order");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.rotate(Math.PI / 2);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -50, 50, 50);
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.worker.js
index 9b47794ab7e..7904fc44ce2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.order.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Transformations are applied in the right order");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.rotate(Math.PI / 2);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -50, 50, 50);
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.html
index b4c54d21952..57b270935a7 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rotate() is clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.rotate(Math.PI / 2);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -100, 50, 100);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.worker.js
index 0488476a18f..5fc873722e2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.direction.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rotate() is clockwise");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.rotate(Math.PI / 2);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -100, 50, 100);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.html
index aabe38b17e9..e1796c6675d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rotate() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.rotate(NaN);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.worker.js
index 8824c70320d..0f588344701 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rotate() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -21,7 +25,6 @@ ctx.rotate(NaN);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.html
index 1feac42cdcd..33b359e0504 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rotate() uses radians");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.worker.js
index efc14c971a5..5206c205bb9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.radians.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rotate() uses radians");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.html
index bc49fd11211..c082426e30e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rotate() wraps large positive values correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.worker.js
index 82d9e301e2f..fa553f06a6d 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrap.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rotate() wraps large positive values correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.html
index 1aa434a39f6..939eabcde65 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rotate() wraps large negative values correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -24,7 +28,6 @@ ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.worker.js
index 1b4dd6b80d0..d04b79f3bc5 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.wrapnegative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rotate() wraps large negative values correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -20,7 +24,6 @@ ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255");
 _assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.html
index 6ec806d4c4a..930802723c9 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("rotate() by 0 does nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.rotate(0);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.worker.js
index 353f96925c4..5edf964f6c2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.rotate.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("rotate() by 0 does nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.rotate(0);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.html
index 9ab8d14ef03..7d8c0f6b21b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("scale() works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.scale(2, 4);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 12.5);
 _assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.worker.js
index e585f5aeea1..bc7b5042ffd 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("scale() works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.scale(2, 4);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 12.5);
 _assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.html
index 62e5d943358..ebef9ef83ca 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.html
@@ -11,6 +11,10 @@
 <p class="notes">Not really that large at all, but it hits the limits in Firefox.
 <script>
 var t = async_test("scale() with large scale factors works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.scale(1e5, 1e5);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 1, 1);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.worker.js
index 9cba39a0b7c..412680e38a4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.large.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("scale() with large scale factors works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.scale(1e5, 1e5);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 1, 1);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.html
index e1a99d94454..c06fe614129 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("Multiple scale()s combine");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.scale(Math.sqrt(2), Math.sqrt(2));
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 25);
 _assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.worker.js
index 98d8918067c..8f1304cd101 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.multiple.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("Multiple scale()s combine");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.scale(Math.sqrt(2), Math.sqrt(2));
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 25);
 _assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.html
index ec478fb4785..2a18792741e 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("scale() with negative scale factors works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -30,7 +34,6 @@ ctx.fillRect(50, -50, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.worker.js
index d6555718b57..d697a25856b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.negative.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("scale() with negative scale factors works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -26,7 +30,6 @@ ctx.fillRect(50, -50, 50, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
 _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.html
index 20163ce43c7..144335e3cf1 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("scale() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.scale(Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.worker.js
index 7637082e125..9dccadbac8b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("scale() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.scale(Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.html
index f0e84692cff..95aa5b97a4b 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("scale() with a scale factor of zero works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -31,7 +35,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.worker.js
index 37776685631..6bbfb25c223 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.scale.zero.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("scale() with a scale factor of zero works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -27,7 +31,6 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.restore();
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.html
index 90d4031e1e2..87eee435eb4 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.setTransform(2,0, 0,2, 0,0);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 25);
 _assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.worker.js
index 424785674cd..552b1f9345a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.multiple.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.setTransform(2,0, 0,2, 0,0);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 25);
 _assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.html
index fa2fcaa913c..46dd565a682 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("setTransform() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -97,7 +101,6 @@ ctx.setTransform(0, 0, 0, 0, Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.worker.js
index 79c0acfd10d..cc826335238 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("setTransform() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -93,7 +97,6 @@ ctx.setTransform(0, 0, 0, 0, Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.html
index cf6df8232c7..6c911f8a9bb 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -44,7 +48,6 @@ _assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.worker.js
index 96b0e1fe6cb..f731ecdcab0 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.setTransform.skewed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,7 +44,6 @@ _assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.html
index fb62cda1e4f..5063959c8c2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("transform() with the identity matrix does nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.transform(1,0, 0,1, 0,0);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.worker.js
index ced3cdbbd0b..6b5fbdadf44 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.identity.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("transform() with the identity matrix does nothing");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.transform(1,0, 0,1, 0,0);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.html
index 900e2e204f6..d36a5390e02 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("transform() multiplies the CTM");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -23,7 +27,6 @@ ctx.transform(-2,1, 3/2,-1/2, 1,-2);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.worker.js
index 253e45c0e8b..f613f328a89 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.multiply.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("transform() multiplies the CTM");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -19,7 +23,6 @@ ctx.transform(-2,1, 3/2,-1/2, 1,-2);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.html
index 6dcb8aa4c60..c8f27b874af 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("transform() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -97,7 +101,6 @@ ctx.transform(0, 0, 0, 0, Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.worker.js
index 4b840886f1b..b062ca9cb8c 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("transform() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -93,7 +97,6 @@ ctx.transform(0, 0, 0, 0, Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.html
index e2892ab9968..c691aa50411 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("transform() with skewy matrix transforms correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -44,7 +48,6 @@ _assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.worker.js
index d17e1e3726c..726fba7877f 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.transform.skewed.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("transform() with skewy matrix transforms correctly");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -40,7 +44,6 @@ _assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255");
 _assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255");
 _assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.html
index 6f7110cb1a9..0cdf2a1f9ea 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("translate() works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -22,7 +26,6 @@ ctx.translate(100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.worker.js
index 8416af68481..5f6d0393b1a 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.basic.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("translate() works");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -18,7 +22,6 @@ ctx.translate(100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -50, 100, 50);
 _assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.html b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.html
index dd6059670cf..d2e87c5e5c2 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.html
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.html
@@ -11,6 +11,10 @@
 
 <script>
 var t = async_test("translate() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -29,7 +33,6 @@ ctx.translate(Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.worker.js b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.worker.js
index 53d01ad83c8..3055c588068 100644
--- a/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/transformations/2d.transformation.translate.nonfinite.worker.js
@@ -7,6 +7,10 @@ importScripts("/resources/testharness.js");
 importScripts("/2dcontext/resources/canvas-tests.js");
 
 var t = async_test("translate() with Infinity/NaN is ignored");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
 t.step(function() {
 
 var offscreenCanvas = new OffscreenCanvas(100, 50);
@@ -25,7 +29,6 @@ ctx.translate(Infinity, Infinity);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -10, 100, 50);
 _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/resources/testdriver.js b/tests/wpt/web-platform-tests/resources/testdriver.js
index bd38e3e006a..22d5ead7226 100644
--- a/tests/wpt/web-platform-tests/resources/testdriver.js
+++ b/tests/wpt/web-platform-tests/resources/testdriver.js
@@ -210,6 +210,33 @@
             return window.test_driver_internal.generate_test_report(message);
         },
 
+        /**
+         * Sets the state of a permission
+         *
+         * This function simulates a user setting a permission into a particular state as described
+         * in {@link https://w3c.github.io/permissions/#set-permission-command}
+         *
+         * @param {String} name - the name of the permission
+         * @param {String} state - the state of the permission
+         * @param {boolean} one_realm - Optional. Whether the permission applies to only one realm
+         *
+         * The above params are used to create a [PermissionSetParameters]{@link
+         * https://w3c.github.io/permissions/#dictdef-permissionsetparameters} object
+         *
+         * @returns {Promise} fulfilled after the permission is set, or rejected if setting the
+         *                    permission fails
+         */
+        set_permission: function(name, state, one_realm) {
+            let permission_params = {
+              descriptor: {
+                name: name
+              },
+              state: state,
+              oneRealm: one_realm,
+            };
+            return window.test_driver_internal.set_permission(permission_params);
+        },
+
         /**
          * Creates a virtual authenticator
          *
@@ -427,6 +454,23 @@
             return Promise.reject(new Error("unimplemented"));
         },
 
+
+        /**
+         * Sets the state of a permission
+         *
+         * This function simulates a user setting a permission into a particular state as described
+         * in {@link https://w3c.github.io/permissions/#set-permission-command}
+         *
+         * @param {Object} permission_params - a [PermissionSetParameters]{@lint
+         *                                     https://w3c.github.io/permissions/#dictdef-permissionsetparameters}
+         *                                     object
+         * @returns {Promise} fulfilled after the permission is set, or rejected if setting the
+         *                    permission fails
+         */
+        set_permission: function(permission_params) {
+            return Promise.reject(new Error("unimplemented"));
+        },
+
         /**
          * Creates a virtual authenticator
          *
diff --git a/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-2.html b/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-2.html
index f48bbffa859..7e27f469e87 100644
--- a/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-2.html
+++ b/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-2.html
@@ -19,10 +19,10 @@
 <script>
   async_test(function(t) {
     let a = document.getElementById('a');
-    a.ended = 0;
-    a.addEventListener('endEvent', t.step_func(function() {
-      a.ended++;
-      if (a.ended === 2)
+    a.begun = 0;
+    a.addEventListener('beginEvent', t.step_func(function() {
+      a.begun++;
+      if (a.begun === 2)
         t.done();
     }));
   });
diff --git a/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-events.html b/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-events.html
new file mode 100644
index 00000000000..09d5c2e7b80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-events.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Cyclic syncbase dependency with syncbase trigger - event dispatching</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<svg>
+  <rect width="100" height="100" fill="blue">
+    <animate attributeName="fill" from="yellow" to="blue" id="a"
+             begin="c.end; b.begin" dur="10ms"/>
+  </rect>
+  <rect width="100" height="100" x="100" fill="blue">
+    <animate attributeName="fill" from="yellow" to="blue" id="b"
+             begin="c.end; a.begin" dur="10ms"/>
+  </rect>
+  <rect width="100" height="100" x="200" fill="blue">
+    <animate attributeName="fill" from="yellow" to="blue" id="c"
+             begin="0; 15ms" dur="10ms"/>
+  </rect>
+</svg>
+<script>
+  promise_test(function(t) {
+    // Wait for two beginEvent/endEvent pairs on all the timed elements.
+    let promises = ['a', 'b', 'c'].map(function(id) {
+      return new EventWatcher(t, document.getElementById(id),
+                              ['beginEvent', 'endEvent'])
+        .wait_for(['beginEvent', 'endEvent',
+                   'beginEvent', 'endEvent']);
+    });
+    return Promise.all(promises);
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-to-large-time.html b/tests/wpt/web-platform-tests/svg/animations/seeking-to-large-time.html
new file mode 100644
index 00000000000..2f89200cbbc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/seeking-to-large-time.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<title>SVGSVGElement.prototype.setCurrentTime: Large time argument</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<svg>
+  <rect width="100" height="100" fill="green">
+    <set attributeName="fill" to="red"
+         begin="9223372036854775807" dur="10ms"/>
+  </rect>
+</svg>
+<script>
+  async_test(function(t) {
+    onload = t.step_func(function() {
+      document.querySelector("svg").setCurrentTime(9223372036854775807);
+      requestAnimationFrame(t.step_func(function() {
+        t.step_timeout(function() {
+          let rect = document.querySelector('rect');
+          assert_equals(getComputedStyle(rect).fill, 'rgb(0, 128, 0)');
+          t.done();
+        }, 11);
+      }));
+    });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/testdata/epochs_daily_push_event.json b/tests/wpt/web-platform-tests/tools/ci/tc/testdata/epochs_daily_push_event.json
new file mode 100644
index 00000000000..0f74c315d23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/ci/tc/testdata/epochs_daily_push_event.json
@@ -0,0 +1,460 @@
+{
+  "ref": "refs/heads/epochs/daily",
+  "before": "20bb1ca5db519ee5d37ece6492868f8a6b65a2e7",
+  "after": "5df56b25e1cb81f81fe16c88be839f9fd538b41e",
+  "repository": {
+    "id": 3618133,
+    "node_id": "MDEwOlJlcG9zaXRvcnkzNjE4MTMz",
+    "name": "wpt",
+    "full_name": "web-platform-tests/wpt",
+    "private": false,
+    "owner": {
+      "name": "web-platform-tests",
+      "email": null,
+      "login": "web-platform-tests",
+      "id": 37226233,
+      "node_id": "MDEyOk9yZ2FuaXphdGlvbjM3MjI2MjMz",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/37226233?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-platform-tests",
+      "html_url": "https://github.com/web-platform-tests",
+      "followers_url": "https://api.github.com/users/web-platform-tests/followers",
+      "following_url": "https://api.github.com/users/web-platform-tests/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-platform-tests/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-platform-tests/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-platform-tests/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-platform-tests/orgs",
+      "repos_url": "https://api.github.com/users/web-platform-tests/repos",
+      "events_url": "https://api.github.com/users/web-platform-tests/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-platform-tests/received_events",
+      "type": "Organization",
+      "site_admin": false
+    },
+    "html_url": "https://github.com/web-platform-tests/wpt",
+    "description": "Test suites for Web platform specs — including WHATWG, W3C, and others",
+    "fork": false,
+    "url": "https://github.com/web-platform-tests/wpt",
+    "forks_url": "https://api.github.com/repos/web-platform-tests/wpt/forks",
+    "keys_url": "https://api.github.com/repos/web-platform-tests/wpt/keys{/key_id}",
+    "collaborators_url": "https://api.github.com/repos/web-platform-tests/wpt/collaborators{/collaborator}",
+    "teams_url": "https://api.github.com/repos/web-platform-tests/wpt/teams",
+    "hooks_url": "https://api.github.com/repos/web-platform-tests/wpt/hooks",
+    "issue_events_url": "https://api.github.com/repos/web-platform-tests/wpt/issues/events{/number}",
+    "events_url": "https://api.github.com/repos/web-platform-tests/wpt/events",
+    "assignees_url": "https://api.github.com/repos/web-platform-tests/wpt/assignees{/user}",
+    "branches_url": "https://api.github.com/repos/web-platform-tests/wpt/branches{/branch}",
+    "tags_url": "https://api.github.com/repos/web-platform-tests/wpt/tags",
+    "blobs_url": "https://api.github.com/repos/web-platform-tests/wpt/git/blobs{/sha}",
+    "git_tags_url": "https://api.github.com/repos/web-platform-tests/wpt/git/tags{/sha}",
+    "git_refs_url": "https://api.github.com/repos/web-platform-tests/wpt/git/refs{/sha}",
+    "trees_url": "https://api.github.com/repos/web-platform-tests/wpt/git/trees{/sha}",
+    "statuses_url": "https://api.github.com/repos/web-platform-tests/wpt/statuses/{sha}",
+    "languages_url": "https://api.github.com/repos/web-platform-tests/wpt/languages",
+    "stargazers_url": "https://api.github.com/repos/web-platform-tests/wpt/stargazers",
+    "contributors_url": "https://api.github.com/repos/web-platform-tests/wpt/contributors",
+    "subscribers_url": "https://api.github.com/repos/web-platform-tests/wpt/subscribers",
+    "subscription_url": "https://api.github.com/repos/web-platform-tests/wpt/subscription",
+    "commits_url": "https://api.github.com/repos/web-platform-tests/wpt/commits{/sha}",
+    "git_commits_url": "https://api.github.com/repos/web-platform-tests/wpt/git/commits{/sha}",
+    "comments_url": "https://api.github.com/repos/web-platform-tests/wpt/comments{/number}",
+    "issue_comment_url": "https://api.github.com/repos/web-platform-tests/wpt/issues/comments{/number}",
+    "contents_url": "https://api.github.com/repos/web-platform-tests/wpt/contents/{+path}",
+    "compare_url": "https://api.github.com/repos/web-platform-tests/wpt/compare/{base}...{head}",
+    "merges_url": "https://api.github.com/repos/web-platform-tests/wpt/merges",
+    "archive_url": "https://api.github.com/repos/web-platform-tests/wpt/{archive_format}{/ref}",
+    "downloads_url": "https://api.github.com/repos/web-platform-tests/wpt/downloads",
+    "issues_url": "https://api.github.com/repos/web-platform-tests/wpt/issues{/number}",
+    "pulls_url": "https://api.github.com/repos/web-platform-tests/wpt/pulls{/number}",
+    "milestones_url": "https://api.github.com/repos/web-platform-tests/wpt/milestones{/number}",
+    "notifications_url": "https://api.github.com/repos/web-platform-tests/wpt/notifications{?since,all,participating}",
+    "labels_url": "https://api.github.com/repos/web-platform-tests/wpt/labels{/name}",
+    "releases_url": "https://api.github.com/repos/web-platform-tests/wpt/releases{/id}",
+    "deployments_url": "https://api.github.com/repos/web-platform-tests/wpt/deployments",
+    "created_at": 1330865891,
+    "updated_at": "2019-11-30T21:34:30Z",
+    "pushed_at": 1575160610,
+    "git_url": "git://github.com/web-platform-tests/wpt.git",
+    "ssh_url": "git@github.com:web-platform-tests/wpt.git",
+    "clone_url": "https://github.com/web-platform-tests/wpt.git",
+    "svn_url": "https://github.com/web-platform-tests/wpt",
+    "homepage": "https://web-platform-tests.org/",
+    "size": 329465,
+    "stargazers_count": 2543,
+    "watchers_count": 2543,
+    "language": "HTML",
+    "has_issues": true,
+    "has_projects": true,
+    "has_downloads": true,
+    "has_wiki": true,
+    "has_pages": true,
+    "forks_count": 1838,
+    "mirror_url": null,
+    "archived": false,
+    "disabled": false,
+    "open_issues_count": 1590,
+    "license": {
+      "key": "other",
+      "name": "Other",
+      "spdx_id": "NOASSERTION",
+      "url": null,
+      "node_id": "MDc6TGljZW5zZTA="
+    },
+    "forks": 1838,
+    "open_issues": 1590,
+    "watchers": 2543,
+    "default_branch": "master",
+    "stargazers": 2543,
+    "master_branch": "master",
+    "organization": "web-platform-tests"
+  },
+  "pusher": {
+    "name": "github-actions[bot]",
+    "email": null
+  },
+  "organization": {
+    "login": "web-platform-tests",
+    "id": 37226233,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjM3MjI2MjMz",
+    "url": "https://api.github.com/orgs/web-platform-tests",
+    "repos_url": "https://api.github.com/orgs/web-platform-tests/repos",
+    "events_url": "https://api.github.com/orgs/web-platform-tests/events",
+    "hooks_url": "https://api.github.com/orgs/web-platform-tests/hooks",
+    "issues_url": "https://api.github.com/orgs/web-platform-tests/issues",
+    "members_url": "https://api.github.com/orgs/web-platform-tests/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/web-platform-tests/public_members{/member}",
+    "avatar_url": "https://avatars0.githubusercontent.com/u/37226233?v=4",
+    "description": ""
+  },
+  "sender": {
+    "login": "github-actions[bot]",
+    "id": 41898282,
+    "node_id": "MDM6Qm90NDE4OTgyODI=",
+    "avatar_url": "https://avatars2.githubusercontent.com/in/15368?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+    "html_url": "https://github.com/apps/github-actions",
+    "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+    "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+    "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+    "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+    "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+    "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+    "type": "Bot",
+    "site_admin": false
+  },
+  "created": false,
+  "deleted": false,
+  "forced": false,
+  "base_ref": "refs/heads/epochs/six_hourly",
+  "compare": "https://github.com/web-platform-tests/wpt/compare/20bb1ca5db51...5df56b25e1cb",
+  "commits": [
+    {
+      "id": "3503c50a6452e153bde906a9c6644cb6237224fc",
+      "tree_id": "b735fa0ae88ebe0abd6764a1afd63aea815ac18e",
+      "distinct": false,
+      "message": "[LayoutNG] Pixel-snap column rules.\n\nBug: 829028\nChange-Id: I252901109502256f14bc68e64d4303006db50a13\nReviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1944350\nCommit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>\nReviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>\nCr-Commit-Position: refs/heads/master@{#720302}",
+      "timestamp": "2019-11-29T16:25:44-08:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/3503c50a6452e153bde906a9c6644cb6237224fc",
+      "author": {
+        "name": "Morten Stenshorne",
+        "email": "mstensho@chromium.org",
+        "username": "mstensho"
+      },
+      "committer": {
+        "name": "Blink WPT Bot",
+        "email": "blink-w3c-test-autoroller@chromium.org",
+        "username": "chromium-wpt-export-bot"
+      },
+      "added": [
+        "css/css-multicol/equal-gap-and-rule.html"
+      ],
+      "removed": [
+
+      ],
+      "modified": [
+
+      ]
+    },
+    {
+      "id": "561b765308e6d188618f3ba73091bb598d8357ce",
+      "tree_id": "775ac4481c03e020819910d03019f0ec93def868",
+      "distinct": false,
+      "message": "Fix parser mXSS sanitizer bypass for <p> and <br> within foreign context\n\nPrior to this CL, the following code:\n <svg></p></svg>\nparsed to this innerHTML: <svg><p></p></svg>\n\nThis is in contrast to this code:\n <svg><p></svg>\nwhich parses to <svg></svg><p></p>\n\nThe fact that the </p> is left inside the <svg> allowed sanitizer\nbypasses as detailed in [1]. Please also see [2] for the spec\ndiscussion.\n\nWith this CL, </p> and </br> within a foreign context now cause\nthe closing of the foreign context.\n\n[1] https://research.securitum.com/dompurify-bypass-using-mxss/\n[2] https://github.com/whatwg/html/issues/5113\n\nBug: 1005713\nChange-Id: Ic07ee50de4eb1ef19b73a075bd83785c99f4f891\nReviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940722\nReviewed-by: Kouhei Ueno <kouhei@chromium.org>\nCommit-Queue: Mason Freed <masonfreed@chromium.org>\nCr-Commit-Position: refs/heads/master@{#720315}",
+      "timestamp": "2019-11-30T00:22:29-08:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/561b765308e6d188618f3ba73091bb598d8357ce",
+      "author": {
+        "name": "Mason Freed",
+        "email": "masonfreed@chromium.org",
+        "username": "mfreed7"
+      },
+      "committer": {
+        "name": "Blink WPT Bot",
+        "email": "blink-w3c-test-autoroller@chromium.org",
+        "username": "chromium-wpt-export-bot"
+      },
+      "added": [
+        "html/syntax/parsing/html_content_in_foreign_context.html"
+      ],
+      "removed": [
+
+      ],
+      "modified": [
+
+      ]
+    },
+    {
+      "id": "d31800185dab8e194294620c8ad6bf40f25bf752",
+      "tree_id": "c718a913e9a5197e1896f5b2ee0434f896d6725b",
+      "distinct": false,
+      "message": "[css-text-4] tests for word-boundary-expansion\n\nhttps://drafts.csswg.org/css-text-4/#word-boundary-expansion",
+      "timestamp": "2019-11-30T18:09:49+09:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/d31800185dab8e194294620c8ad6bf40f25bf752",
+      "author": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "committer": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "added": [
+        "css/css-text/parsing/word-boundary-expansion-computed.html",
+        "css/css-text/parsing/word-boundary-expansion-invalid.html",
+        "css/css-text/parsing/word-boundary-expansion-valid.html",
+        "css/css-text/word-boundary/reference/word-boundary-001-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-002-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-004-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-007-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-008-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-009-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-010-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-011-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-012-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-013-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-014-ref.html",
+        "css/css-text/word-boundary/word-boundary-001.html",
+        "css/css-text/word-boundary/word-boundary-002.html",
+        "css/css-text/word-boundary/word-boundary-003.html",
+        "css/css-text/word-boundary/word-boundary-004.html",
+        "css/css-text/word-boundary/word-boundary-005.html",
+        "css/css-text/word-boundary/word-boundary-006.html",
+        "css/css-text/word-boundary/word-boundary-007.html",
+        "css/css-text/word-boundary/word-boundary-008.html",
+        "css/css-text/word-boundary/word-boundary-009.html",
+        "css/css-text/word-boundary/word-boundary-010.html",
+        "css/css-text/word-boundary/word-boundary-011.html",
+        "css/css-text/word-boundary/word-boundary-012.html",
+        "css/css-text/word-boundary/word-boundary-013.html",
+        "css/css-text/word-boundary/word-boundary-014.html",
+        "css/css-text/word-boundary/word-boundary-015-manual.html"
+      ],
+      "removed": [
+
+      ],
+      "modified": [
+
+      ]
+    },
+    {
+      "id": "37ddab0528d8ab49db1371188e36f68133ff5c1c",
+      "tree_id": "832644a697a1cdcaf93126d4f95c89f71b4f5d47",
+      "distinct": false,
+      "message": "[css-text-4] tests for word-boundary-detection\n\nhttps://drafts.csswg.org/css-text-4/#word-boundary-detection",
+      "timestamp": "2019-11-30T18:09:49+09:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/37ddab0528d8ab49db1371188e36f68133ff5c1c",
+      "author": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "committer": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "added": [
+        "css/css-text/word-boundary/reference/word-boundary-101-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-102-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-103-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-104-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-105-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-106-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-107-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-108-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-109-a-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-109-b-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-110-a-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-110-b-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-111-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-112-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-113-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-114-a-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-114-b-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-115-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-116-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-117-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-119-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-120-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-121-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-122-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-123-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-124-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-125-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-126-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-127-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-128-ref.html",
+        "css/css-text/word-boundary/reference/word-boundary-129-ref.html",
+        "css/css-text/word-boundary/word-boundary-101.html",
+        "css/css-text/word-boundary/word-boundary-102.html",
+        "css/css-text/word-boundary/word-boundary-103.html",
+        "css/css-text/word-boundary/word-boundary-104.html",
+        "css/css-text/word-boundary/word-boundary-105.html",
+        "css/css-text/word-boundary/word-boundary-106.html",
+        "css/css-text/word-boundary/word-boundary-107.html",
+        "css/css-text/word-boundary/word-boundary-108.html",
+        "css/css-text/word-boundary/word-boundary-109.html",
+        "css/css-text/word-boundary/word-boundary-110.html",
+        "css/css-text/word-boundary/word-boundary-111.html",
+        "css/css-text/word-boundary/word-boundary-112.html",
+        "css/css-text/word-boundary/word-boundary-113.html",
+        "css/css-text/word-boundary/word-boundary-114.html",
+        "css/css-text/word-boundary/word-boundary-115.html",
+        "css/css-text/word-boundary/word-boundary-116.html",
+        "css/css-text/word-boundary/word-boundary-117.html",
+        "css/css-text/word-boundary/word-boundary-118.html",
+        "css/css-text/word-boundary/word-boundary-119.html",
+        "css/css-text/word-boundary/word-boundary-120.html",
+        "css/css-text/word-boundary/word-boundary-121.html",
+        "css/css-text/word-boundary/word-boundary-122.html",
+        "css/css-text/word-boundary/word-boundary-123.html",
+        "css/css-text/word-boundary/word-boundary-124.html",
+        "css/css-text/word-boundary/word-boundary-125.html",
+        "css/css-text/word-boundary/word-boundary-126.html",
+        "css/css-text/word-boundary/word-boundary-127.html",
+        "css/css-text/word-boundary/word-boundary-128.html",
+        "css/css-text/word-boundary/word-boundary-129.html"
+      ],
+      "removed": [
+
+      ],
+      "modified": [
+
+      ]
+    },
+    {
+      "id": "054edcc23aa1e0ebee50d7ddf1ce6115dd940ece",
+      "tree_id": "b58ca36bb7e928d440bed734e323580467dd32c7",
+      "distinct": false,
+      "message": "[css-text] Fix typo",
+      "timestamp": "2019-11-30T19:08:12+09:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/054edcc23aa1e0ebee50d7ddf1ce6115dd940ece",
+      "author": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "committer": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "added": [
+
+      ],
+      "removed": [
+
+      ],
+      "modified": [
+        "css/css-text/parsing/word-boundary-expansion-computed.html"
+      ]
+    },
+    {
+      "id": "d15d6d91834108a38070771025b548124d44026b",
+      "tree_id": "a1476d347b04acb59ed2562f0d4f845e8252e6d0",
+      "distinct": false,
+      "message": "[css-text add parsing tests for word-boundary-detection",
+      "timestamp": "2019-11-30T19:08:12+09:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/d15d6d91834108a38070771025b548124d44026b",
+      "author": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "committer": {
+        "name": "Florian Rivoal",
+        "email": "git@florian.rivoal.net",
+        "username": "frivoal"
+      },
+      "added": [
+        "css/css-text/parsing/word-boundary-detection-computed.html",
+        "css/css-text/parsing/word-boundary-detection-invalid.html",
+        "css/css-text/parsing/word-boundary-detection-valid.html"
+      ],
+      "removed": [
+
+      ],
+      "modified": [
+
+      ]
+    },
+    {
+      "id": "5df56b25e1cb81f81fe16c88be839f9fd538b41e",
+      "tree_id": "18da87e7701bd6218f4437b4d2d49cefe1f56af9",
+      "distinct": false,
+      "message": "Delete invalid test. (#20547)\n\nIt seems it expects `transform: rotate(1deg, 20px, 20px)` to somehow be valid.\r\n\r\nIt was introduced in cdc3032f56c86cc68121e54e169485441d9cdb1a, pointing to https://www.w3.org/TR/css-transforms-1/#svg-transform-functions, which doesn't say anything like that.\r\n\r\nDoesn't pass in any browser.",
+      "timestamp": "2019-11-30T13:34:24-08:00",
+      "url": "https://github.com/web-platform-tests/wpt/commit/5df56b25e1cb81f81fe16c88be839f9fd538b41e",
+      "author": {
+        "name": "Emilio Cobos Álvarez",
+        "email": "emilio@crisal.io",
+        "username": "emilio"
+      },
+      "committer": {
+        "name": "L. David Baron",
+        "email": "dbaron@dbaron.org",
+        "username": "dbaron"
+      },
+      "added": [
+
+      ],
+      "removed": [
+        "css/css-transforms/external-styles/svg-external-styles-012.html"
+      ],
+      "modified": [
+        "css/css-transforms/external-styles/support/svg-external-styles.css"
+      ]
+    }
+  ],
+  "head_commit": {
+    "id": "5df56b25e1cb81f81fe16c88be839f9fd538b41e",
+    "tree_id": "18da87e7701bd6218f4437b4d2d49cefe1f56af9",
+    "distinct": false,
+    "message": "Delete invalid test. (#20547)\n\nIt seems it expects `transform: rotate(1deg, 20px, 20px)` to somehow be valid.\r\n\r\nIt was introduced in cdc3032f56c86cc68121e54e169485441d9cdb1a, pointing to https://www.w3.org/TR/css-transforms-1/#svg-transform-functions, which doesn't say anything like that.\r\n\r\nDoesn't pass in any browser.",
+    "timestamp": "2019-11-30T13:34:24-08:00",
+    "url": "https://github.com/web-platform-tests/wpt/commit/5df56b25e1cb81f81fe16c88be839f9fd538b41e",
+    "author": {
+      "name": "Emilio Cobos Álvarez",
+      "email": "emilio@crisal.io",
+      "username": "emilio"
+    },
+    "committer": {
+      "name": "L. David Baron",
+      "email": "dbaron@dbaron.org",
+      "username": "dbaron"
+    },
+    "added": [
+
+    ],
+    "removed": [
+      "css/css-transforms/external-styles/svg-external-styles-012.html"
+    ],
+    "modified": [
+      "css/css-transforms/external-styles/support/svg-external-styles.css"
+    ]
+  }
+}
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py b/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py
index 9480178206d..d6cbfba4e2c 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py
@@ -1,5 +1,6 @@
 import json
 import os
+from io import open
 
 import jsone
 import mock
@@ -24,14 +25,14 @@ def data_path(filename):
                    "https://github.com/taskcluster/json-e/issues/338")
 def test_verify_taskcluster_yml():
     """Verify that the json-e in the .taskcluster.yml is valid"""
-    with open(os.path.join(root, ".taskcluster.yml")) as f:
+    with open(os.path.join(root, ".taskcluster.yml"), encoding="utf8") as f:
         template = yaml.safe_load(f)
 
     events = [("pr_event.json", "github-pull-request", "Pull Request"),
               ("master_push_event.json", "github-push", "Push to master")]
 
     for filename, tasks_for, title in events:
-        with open(data_path(filename)) as f:
+        with open(data_path(filename), encoding="utf8") as f:
             event = json.load(f)
 
         context = {"tasks_for": tasks_for,
@@ -60,7 +61,7 @@ def test_verify_payload():
             "wptrunner_unittest"]
 
     for filename in ["pr_event.json", "master_push_event.json"]:
-        with open(data_path(filename)) as f:
+        with open(data_path(filename), encoding="utf8") as f:
             event = json.load(f)
 
         with mock.patch("tools.ci.tc.decision.get_fetch_rev", return_value=(event["after"], None)):
@@ -141,12 +142,80 @@ def test_verify_payload():
       'wpt-chrome-dev-results',
       'wpt-chrome-dev-results-without-changes',
       'lint'}),
+    ("epochs_daily_push_event.json", False, None,
+     {'download-firefox-stable',
+      'wpt-chrome-stable-reftest-1',
+      'wpt-chrome-stable-reftest-2',
+      'wpt-chrome-stable-reftest-3',
+      'wpt-chrome-stable-reftest-4',
+      'wpt-chrome-stable-reftest-5',
+      'wpt-chrome-stable-testharness-1',
+      'wpt-chrome-stable-testharness-10',
+      'wpt-chrome-stable-testharness-11',
+      'wpt-chrome-stable-testharness-12',
+      'wpt-chrome-stable-testharness-13',
+      'wpt-chrome-stable-testharness-14',
+      'wpt-chrome-stable-testharness-15',
+      'wpt-chrome-stable-testharness-16',
+      'wpt-chrome-stable-testharness-2',
+      'wpt-chrome-stable-testharness-3',
+      'wpt-chrome-stable-testharness-4',
+      'wpt-chrome-stable-testharness-5',
+      'wpt-chrome-stable-testharness-6',
+      'wpt-chrome-stable-testharness-7',
+      'wpt-chrome-stable-testharness-8',
+      'wpt-chrome-stable-testharness-9',
+      'wpt-chrome-stable-wdspec-1',
+      'wpt-firefox-stable-reftest-1',
+      'wpt-firefox-stable-reftest-2',
+      'wpt-firefox-stable-reftest-3',
+      'wpt-firefox-stable-reftest-4',
+      'wpt-firefox-stable-reftest-5',
+      'wpt-firefox-stable-testharness-1',
+      'wpt-firefox-stable-testharness-10',
+      'wpt-firefox-stable-testharness-11',
+      'wpt-firefox-stable-testharness-12',
+      'wpt-firefox-stable-testharness-13',
+      'wpt-firefox-stable-testharness-14',
+      'wpt-firefox-stable-testharness-15',
+      'wpt-firefox-stable-testharness-16',
+      'wpt-firefox-stable-testharness-2',
+      'wpt-firefox-stable-testharness-3',
+      'wpt-firefox-stable-testharness-4',
+      'wpt-firefox-stable-testharness-5',
+      'wpt-firefox-stable-testharness-6',
+      'wpt-firefox-stable-testharness-7',
+      'wpt-firefox-stable-testharness-8',
+      'wpt-firefox-stable-testharness-9',
+      'wpt-firefox-stable-wdspec-1',
+      'wpt-webkitgtk_minibrowser-nightly-reftest-1',
+      'wpt-webkitgtk_minibrowser-nightly-reftest-2',
+      'wpt-webkitgtk_minibrowser-nightly-reftest-3',
+      'wpt-webkitgtk_minibrowser-nightly-reftest-4',
+      'wpt-webkitgtk_minibrowser-nightly-reftest-5',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-1',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-10',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-11',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-12',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-13',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-14',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-15',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-16',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-2',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-3',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-4',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-5',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-6',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-7',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-8',
+      'wpt-webkitgtk_minibrowser-nightly-testharness-9',
+      'wpt-webkitgtk_minibrowser-nightly-wdspec-1'})
 ])
 def test_schedule_tasks(event_path, is_pr, files_changed, expected):
     with mock.patch("tools.ci.tc.decision.get_fetch_rev", return_value=(is_pr, None)):
         with mock.patch("tools.wpt.testfiles.repo_files_changed",
                         return_value=files_changed):
-            with open(data_path(event_path)) as event_file:
+            with open(data_path(event_path), encoding="utf8") as event_file:
                 event = json.load(event_file)
                 scheduled = decision.decide(event)
                 assert set(scheduled.keys()) == expected
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index 06b1012ec95..c8a26d042eb 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -666,6 +666,7 @@ class CallbackHandler(object):
             "send_keys": SendKeysAction(self.logger, self.protocol),
             "action_sequence": ActionSequenceAction(self.logger, self.protocol),
             "generate_test_report": GenerateTestReportAction(self.logger, self.protocol),
+            "set_permission": SetPermissionAction(self.logger, self.protocol),
             "add_virtual_authenticator": AddVirtualAuthenticatorAction(self.logger, self.protocol),
             "remove_virtual_authenticator": RemoveVirtualAuthenticatorAction(self.logger, self.protocol),
             "add_credential": AddCredentialAction(self.logger, self.protocol),
@@ -768,6 +769,20 @@ class GenerateTestReportAction(object):
         self.logger.debug("Generating test report: %s" % message)
         self.protocol.generate_test_report.generate_test_report(message)
 
+class SetPermissionAction(object):
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        permission_params = payload["permission_params"]
+        descriptor = permission_params["descriptor"]
+        name = descriptor["name"]
+        state = permission_params["state"]
+        one_realm = permission_params.get("oneRealm", False)
+        self.logger.debug("Setting permission %s to %s, oneRealm=%s" % (name, state, one_realm))
+        self.protocol.set_permission.set_permission(name, state, one_realm)
+
 class AddVirtualAuthenticatorAction(object):
     def __init__(self, logger, protocol):
         self.logger = logger
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 39346e805d7..8ea59b2577d 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
@@ -22,6 +22,7 @@ from .protocol import (BaseProtocolPart,
                        ActionSequenceProtocolPart,
                        TestDriverProtocolPart,
                        GenerateTestReportProtocolPart,
+                       SetPermissionProtocolPart,
                        VirtualAuthenticatorProtocolPart)
 from ..testrunner import Stop
 
@@ -202,6 +203,23 @@ class WebDriverGenerateTestReportProtocolPart(GenerateTestReportProtocolPart):
         json_message = {"message": message}
         self.webdriver.send_session_command("POST", "reporting/generate_test_report", json_message)
 
+
+class WebDriverSetPermissionProtocolPart(SetPermissionProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def set_permission(self, name, state, one_realm):
+        permission_params_dict = {
+            "descriptor": {
+                "name": name
+            },
+            "state": state,
+        }
+        if one_realm is not None:
+            permission_params_dict["oneRealm"] = one_realm
+        self.webdriver.send_session_command("POST", "permissions", permission_params_dict)
+
+
 class WebDriverVirtualAuthenticatorProtocolPart(VirtualAuthenticatorProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -237,6 +255,7 @@ class WebDriverProtocol(Protocol):
                   WebDriverActionSequenceProtocolPart,
                   WebDriverTestDriverProtocolPart,
                   WebDriverGenerateTestReportProtocolPart,
+                  WebDriverSetPermissionProtocolPart,
                   WebDriverVirtualAuthenticatorProtocolPart]
 
     def __init__(self, executor, browser, capabilities, **kwargs):
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 0758312d65f..1a47fa9f1d8 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
@@ -305,6 +305,22 @@ class GenerateTestReportProtocolPart(ProtocolPart):
         pass
 
 
+class SetPermissionProtocolPart(ProtocolPart):
+    """Protocol part for setting permissions"""
+    __metaclass__ = ABCMeta
+
+    name = "set_permission"
+
+    @abstractmethod
+    def set_permission(self, name, state, one_realm=False):
+        """Set permission state.
+
+        :param name: The name of the permission to set.
+        :param state: The state to set the permission to.
+        :param one_realm: Whether to set the permission for only one realm."""
+        pass
+
+
 class ActionSequenceProtocolPart(ProtocolPart):
     """Protocol part for performing trusted clicks"""
     __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 278f226dbd2..745421f59bb 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
@@ -126,6 +126,15 @@
         return pending_promise;
     };
 
+    window.test_driver_internal.set_permission = function(permission_params) {
+        const pending_promise = new Promise(function(resolve, reject) {
+            pending_resolve = resolve;
+            pending_reject = reject;
+        });
+        window.__wptrunner_message_queue.push({"type": "action", "action": "set_permission", permission_params});
+        return pending_promise;
+    };
+
     window.test_driver_internal.add_virtual_authenticator = function(config) {
         const pending_promise = new Promise(function(resolve, reject) {
             pending_resolve = resolve;
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
index 9186e3e3fc2..e0fcdbf28a4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
@@ -4,7 +4,6 @@ from webdriver.error import NoSuchAlertException
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.authentication import basic_authentication
 from tests.support.inline import inline
 from tests.support.sync import Poll
 
@@ -58,13 +57,6 @@ def test_alert_element_not_interactable(session, dialog_type):
     assert_error(response, "element not interactable")
 
 
-def test_alert_unsupported_operation(session):
-    session.url = basic_authentication()
-
-    response = send_alert_text(session, "Federer")
-    assert_error(response, "unsupported operation")
-
-
 @pytest.mark.parametrize("text", ["", "Federer", " Fed erer ", "Fed\terer"])
 def test_send_alert_text(session, page, text):
     send_response = send_alert_text(session, text)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py
index adf265127c9..32e400f4664 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py
@@ -135,9 +135,9 @@ def test_fully_exit_fullscreen(session):
     session.window.fullscreen()
     assert is_fullscreen(session)
 
-    response = set_window_rect(session, {"width": 400, "height": 400})
+    response = set_window_rect(session, {"width": 600, "height": 400})
     value = assert_success(response)
-    assert value["width"] == 400
+    assert value["width"] == 600
     assert value["height"] == 400
 
     assert not is_fullscreen(session)
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
index 71ca78abb48..1f3e3765df4 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
@@ -25,6 +25,23 @@ let testFunction = function(session, fakeDeviceController, t) {
       let space1 = spaces[0];
       let space2 = spaces[1];
 
+      let offset = new XRRigidTransform(
+        DOMPointReadOnly.fromPoint({
+          x: 2,
+          y: 3,
+          z: 4,
+          w: 1,
+        }));
+
+      let translatedSpace1 = space1.getOffsetReferenceSpace(offset);
+      let translated_from_base = xrFrame.getPose(translatedSpace1, space1);
+
+      // Getting the transform of an offset space from the space it was based on
+      // should be the same as the initially applied offset.
+      t.step(() => {
+        assert_matrix_approx_equals(translated_from_base.transform.matrix, offset.matrix, FLOAT_EPSILON);
+      });
+
       // Rotate 90 degrees about x axis, then move 1 meter along y axis.
       space1 = space1.getOffsetReferenceSpace(new XRRigidTransform(
         DOMPointReadOnly.fromPoint({
@@ -57,14 +74,17 @@ let testFunction = function(session, fakeDeviceController, t) {
         })
       ));
 
-      let space1_from_space2 = xrFrame.getPose(space1, space2);
+      let space2_from_space1 = xrFrame.getPose(space1, space2);
       const EXPECTED_POSE_MATRIX = [
-        0, 0, -1, 0, // 1st column
-        -1, 0, 0, 0, // 2nd column
-        0, 1, 0, 0, // 3rd column
-        1, 0, 1, 1 // 4th column
+         0, -1, 0, 0, // 1st column
+         0,  0, 1, 0, // 2nd column
+        -1,  0, 0, 0, // 3rd column
+         1,  1, 0, 1 // 4th column
       ];
-      assert_matrix_approx_equals(space1_from_space2.transform.matrix, EXPECTED_POSE_MATRIX, FLOAT_EPSILON);
+
+      t.step(() => {
+        assert_matrix_approx_equals(space2_from_space1.transform.matrix, EXPECTED_POSE_MATRIX, FLOAT_EPSILON);
+      });
 
       // Finished test.
       resolve();