Bug 1436451 [wpt PR 9427] - [css-layout-api][css-paint-api] Generalize paintWorklet test runner to work with layoutWorklet., a=testonly
☠☠ backed out by a6a32fb286fa ☠ ☠
authorIan Kilpatrick <ikilpatrick@chromium.org>
Tue, 06 Mar 2018 18:14:49 +0000
changeset 461959 fef37d4246d40e4089fabaf920758338ef64ab96
parent 461958 99fd7a7dcbca064525104d30c249da69ec7376e2
child 461960 3f1f453a3cdd9e2eeb9145a0b5333591e9a4a120
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1436451, 907028, 535067
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1436451 [wpt PR 9427] - [css-layout-api][css-paint-api] Generalize paintWorklet test runner to work with layoutWorklet., a=testonly Automatic update from web-platform-tests This should have no behaviour change. This preparation for some CSS.layoutWorklet reftests. Change-Id: I0f270a0e60aeadb367abe0ab7ef34e58b3d65096 Reviewed-on: https://chromium-review.googlesource.com/907028 Reviewed-by: Xida Chen <xidachen@chromium.org> Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org> Cr-Commit-Position: refs/heads/master@{#535067} <!-- Reviewable:start --> <!-- Reviewable:end --> wpt-commits: 0bfaa837553a7b66b84b207e702b6b403ad6d990 wpt-pr: 9427 reapplied-commits: 370e267e160568862f1fd9ec246ab5bb840f586e, fe4514c84e7ad28e46bad5da93381deb99b177f3, 7806af854343c043a2645a4034fdc7812f65daad, 9ddfd21554293dec5a4bf2e5375ae4f3c9f2ded0, 75f63c4d1ebc949647184fd60972fc7b9fd4affb, 1f3a5b496acd2288cc8cf0c32af86cb35157ea4e, 88b42bd5847abac58a62c4d6b33c1509bfce5f3d, 15c2e4c690700c6c115f8afe5e44ded10d943538, c8d461ef1437641ae7d4ea1d21e1e60cd62910b0, a6088a5f48ee299386a84d2f771902267d7355b1, 0634cd8f08ebe0905a9188fb1398c7b5f889c5dc, c8ee4a012dae506ae06bb5b2ad50942b04c1aaaa, c2c352456a4cf62dcc12f851138b04397675a445, b93a8879555d2fa7e7d4e00a275513a3a6338b35, b86e1331cb36634fd33677043b61fc0c1d8485bc, 44ddf14fd3346658c3223f13652073fafbfa48fa, a1a5840a6bb53e305ba02bcbeb215659342d0edb, 7465cb110ae5ec2e2ca73182caf5293f0efc8fd5, aad5349b3458bc3414e274b33fa86a1123901ff2, eca0907980d2769c449894a6277c60c1a306792f, 38626987c0cfd6e715cfcc6f4f1a1209191a03c5, e4a67f7ddcde6cd99348e9104bd7ed07074da44a, bb3c9990840a0fae2afc840b5952d7874785b112, 042d7adef0bdb9dc80e825c3997ace7519477c42, 99f1ea44fc7915b8b7b33bce4732fa8765fd3ac2, b81999f30c1516a70c153de51a0331d14c8faead
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/common/css-paint-tests.js
testing/web-platform/tests/common/worklet-reftest.js
testing/web-platform/tests/css/css-paint-api/background-image-alpha.https.html
testing/web-platform/tests/css/css-paint-api/background-image-multiple.https.html
testing/web-platform/tests/css/css-paint-api/background-image-tiled.https.html
testing/web-platform/tests/css/css-paint-api/geometry-background-image-001.https.html
testing/web-platform/tests/css/css-paint-api/geometry-background-image-002.https.html
testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-001.https.html
testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-002.https.html
testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-003.https.html
testing/web-platform/tests/css/css-paint-api/geometry-border-image-001.https.html
testing/web-platform/tests/css/css-paint-api/geometry-border-image-002.https.html
testing/web-platform/tests/css/css-paint-api/geometry-border-image-003.https.html
testing/web-platform/tests/css/css-paint-api/geometry-border-image-004.https.html
testing/web-platform/tests/css/css-paint-api/geometry-with-float-size.https.html
testing/web-platform/tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html
testing/web-platform/tests/css/css-paint-api/invalid-image-constructor-error.https.html
testing/web-platform/tests/css/css-paint-api/invalid-image-paint-error.https.html
testing/web-platform/tests/css/css-paint-api/invalid-image-pending-script.https.html
testing/web-platform/tests/css/css-paint-api/overdraw.https.html
testing/web-platform/tests/css/css-paint-api/paint-arguments.https.html
testing/web-platform/tests/css/css-paint-api/paint-function-arguments.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-composite.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-filter.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-gradient.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-image.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-paths.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-rects.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-shadows.https.html
testing/web-platform/tests/css/css-paint-api/paint2d-transform.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-001.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-004.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-007.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-013.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-014.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-015.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-017.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-018.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-019.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-020.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-021.https.html
testing/web-platform/tests/css/css-paint-api/parse-input-arguments-022.https.html
testing/web-platform/tests/css/css-paint-api/registered-properties-in-custom-paint.https.html
testing/web-platform/tests/css/css-paint-api/style-background-image.https.html
testing/web-platform/tests/css/css-paint-api/style-before-pseudo.https.html
testing/web-platform/tests/css/css-paint-api/style-first-letter-pseudo.https.html
testing/web-platform/tests/css/css-paint-api/valid-image-after-load.https.html
testing/web-platform/tests/css/css-paint-api/valid-image-before-load.https.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -188337,21 +188337,16 @@
      {}
     ]
    ],
    "common/canvas-tests.js.headers": [
     [
      {}
     ]
    ],
-   "common/css-paint-tests.js": [
-    [
-     {}
-    ]
-   ],
    "common/css-paint-tests.js.headers": [
     [
      {}
     ]
    ],
    "common/css-red.txt": [
     [
      {}
@@ -188482,16 +188477,21 @@
      {}
     ]
    ],
    "common/utils.js.headers": [
     [
      {}
     ]
    ],
+   "common/worklet-reftest.js": [
+    [
+     {}
+    ]
+   ],
    "compat/OWNERS": [
     [
      {}
     ]
    ],
    "compat/green-ref.html": [
     [
      {}
@@ -395756,20 +395756,16 @@
   "common/canvas-tests.js": [
    "329e3ae1cfde2ee0525302e6a3260faed3885f28",
    "support"
   ],
   "common/canvas-tests.js.headers": [
    "e3593850f8098d3f3ff82c042deab15f51c66a52",
    "support"
   ],
-  "common/css-paint-tests.js": [
-   "81e8d7dc10c489d1d3ef2666a437b5e3972b9643",
-   "support"
-  ],
   "common/css-paint-tests.js.headers": [
    "e3593850f8098d3f3ff82c042deab15f51c66a52",
    "support"
   ],
   "common/css-red.txt": [
    "9edd8c61eb63c9b63fd7301e65174b5f7f87bbe1",
    "support"
   ],
@@ -395872,16 +395868,20 @@
   "common/utils.js": [
    "1d8598ff2c801c54c0f9be1c688b753bb6291c94",
    "support"
   ],
   "common/utils.js.headers": [
    "e3593850f8098d3f3ff82c042deab15f51c66a52",
    "support"
   ],
+  "common/worklet-reftest.js": [
+   "b8ebd1ad4a6a5600cfa0e9e60e26981bbccf19f0",
+   "support"
+  ],
   "compat/OWNERS": [
    "e714708a95e56bc556b64d991cb72f0ccace4f92",
    "support"
   ],
   "compat/green-ref.html": [
    "4b23ea52d785a6dd19785bd4278bf700eb5547f8",
    "support"
   ],
@@ -497469,377 +497469,377 @@
    "0c1517f7ba747014c7c091b61d48f11421ed91c2",
    "support"
   ],
   "css/css-paint-api/background-image-alpha-ref.html": [
    "45ef6e998e5f266741f5403df650cd9557dbe005",
    "support"
   ],
   "css/css-paint-api/background-image-alpha.https.html": [
-   "84acc5f998812497d344067d7095c7561dda13ee",
+   "9e49088b455ebad6c98af7e5610c31d59cb70d5c",
    "reftest"
   ],
   "css/css-paint-api/background-image-multiple-ref.html": [
    "9ff536499d72240f67eb6911b768c624371ea678",
    "support"
   ],
   "css/css-paint-api/background-image-multiple.https.html": [
-   "9e43ca2821fa0075073a898efde7595f6b57fad4",
+   "89f02190795801c78429786e376a9731a03aca99",
    "reftest"
   ],
   "css/css-paint-api/background-image-tiled-ref.html": [
    "bcee5040691f057a672e58eec3beed75122be3b8",
    "support"
   ],
   "css/css-paint-api/background-image-tiled.https.html": [
-   "83f9e2566f9e6957fdf3b67e9e62374984861e78",
+   "90f38d9cafef5f492085e8c161dc62cf4de2561d",
    "reftest"
   ],
   "css/css-paint-api/geometry-background-image-001-ref.html": [
    "bca138ca3ce5b6dee10f935fd2ff9756d18b12ef",
    "support"
   ],
   "css/css-paint-api/geometry-background-image-001.https.html": [
-   "a1f6d2148bfcdb68e4ca437b396b0ccbada101a9",
+   "f4553e156ec81284b6c96a3b5ed5f2c3f5e4378f",
    "reftest"
   ],
   "css/css-paint-api/geometry-background-image-002-ref.html": [
    "4d33168e6298c1ed7d44ff431791615cdaf9038f",
    "support"
   ],
   "css/css-paint-api/geometry-background-image-002.https.html": [
-   "f48a940cfc7b3654ee92b655330ae30af5315e17",
+   "f3e6717b942fc8c674d359583dfb46b1e71aef8a",
    "reftest"
   ],
   "css/css-paint-api/geometry-background-image-tiled-001-ref.html": [
    "475fd7979cd173f378c03a7d9d27503e12c2dc7c",
    "support"
   ],
   "css/css-paint-api/geometry-background-image-tiled-001.https.html": [
-   "a892266cab4d74a3f4df2bbe1cda8823a38f3153",
+   "8bc58319aad57fb82025a35403ef3bb8848cfc34",
    "reftest"
   ],
   "css/css-paint-api/geometry-background-image-tiled-002-ref.html": [
    "c5363f4f7843ff8025ae5457524c0c9f4aac144c",
    "support"
   ],
   "css/css-paint-api/geometry-background-image-tiled-002.https.html": [
-   "051788b53366cffcc10debdf2d678d50bffd1f54",
+   "c3dcbe7e2c7ddb8944cdb5d4c535bbb5f52fe27e",
    "reftest"
   ],
   "css/css-paint-api/geometry-background-image-tiled-003-ref.html": [
    "d4f9428be3b8f9003eb9373b3eb87ebed0c55c15",
    "support"
   ],
   "css/css-paint-api/geometry-background-image-tiled-003.https.html": [
-   "29141ae2c9c87237ed3406dd43c6b3a7a1a5aa36",
+   "946dd278cd4c8f847032dc03155422480713bb50",
    "reftest"
   ],
   "css/css-paint-api/geometry-border-image-001-ref.html": [
    "81026e756ea8e3be653e176c09f1762507915cb8",
    "support"
   ],
   "css/css-paint-api/geometry-border-image-001.https.html": [
-   "d8f948af1254c810496739e4c7cc570ba96cf64f",
+   "b7532a7b90f081f981dc2e20371fd9a8c367054b",
    "reftest"
   ],
   "css/css-paint-api/geometry-border-image-002-ref.html": [
    "076c1f3e3b5cfd3a434e94f33872f5f598a7225b",
    "support"
   ],
   "css/css-paint-api/geometry-border-image-002.https.html": [
-   "57b518eb310db31c40f0db37637b0f8199ee9734",
+   "416b0c72bcc019565452a6b26547ae40a70f497f",
    "reftest"
   ],
   "css/css-paint-api/geometry-border-image-003-ref.html": [
    "141bf94dcd935420b95ee4da52139bf51318196d",
    "support"
   ],
   "css/css-paint-api/geometry-border-image-003.https.html": [
-   "9d01df8817d9e5beb27d3439789cbe914c418b2c",
+   "e8c1b3b43198df01d1205a7f6a8399d9ae76471b",
    "reftest"
   ],
   "css/css-paint-api/geometry-border-image-004-ref.html": [
    "d730b44bd1020305b70da095a15f9a4f7e9f262a",
    "support"
   ],
   "css/css-paint-api/geometry-border-image-004.https.html": [
-   "368a9d855ffc46457e6c54cddfbc934e92096ee0",
+   "f61171df06dc738ec169c985245674c3cd10c215",
    "reftest"
   ],
   "css/css-paint-api/geometry-with-float-size-ref.html": [
    "4ccf13c66fbd9ce8a2f04eab8b5f6cd24a6601fa",
    "support"
   ],
   "css/css-paint-api/geometry-with-float-size.https.html": [
-   "911b7945792a8d3157cf183e4eb02e6e10ffa80a",
+   "f8aee6ab06544b722f8f001c1397748268db5e91",
    "reftest"
   ],
   "css/css-paint-api/hidpi/device-pixel-ratio-ref.html": [
    "18f9d4d369de750ceb92c2e275ede5fcb3bf6f49",
    "support"
   ],
   "css/css-paint-api/hidpi/device-pixel-ratio.https.html": [
-   "470ec454e18e5398718f3117171b172208f84fee",
+   "6e59c99888bc19315b0d83463f8c387902548742",
    "reftest"
   ],
   "css/css-paint-api/invalid-image-constructor-error-ref.html": [
    "9ae74dc1b6bc4a2f346d072eca0020e7fd1b39ec",
    "support"
   ],
   "css/css-paint-api/invalid-image-constructor-error.https.html": [
-   "3fb935202b776ac0669804e7484a6a56667db64a",
+   "6a713ff6efbe731edbd47b94a9d95cafebcdcfd8",
    "reftest"
   ],
   "css/css-paint-api/invalid-image-paint-error-ref.html": [
    "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
    "support"
   ],
   "css/css-paint-api/invalid-image-paint-error.https.html": [
-   "14d684741bcea0c95b1f50881f489e29abff080c",
+   "9f5dcb1bdd25a5edcd541683238965292426bf83",
    "reftest"
   ],
   "css/css-paint-api/invalid-image-pending-script-ref.html": [
    "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
    "support"
   ],
   "css/css-paint-api/invalid-image-pending-script.https.html": [
-   "780d368f790ae61cd3d9a575213dd8c9cce9a3a6",
+   "3e24c1a63d52d6ccb7aab1406667c35ffd162709",
    "reftest"
   ],
   "css/css-paint-api/overdraw-ref.html": [
    "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
    "support"
   ],
   "css/css-paint-api/overdraw.https.html": [
-   "1f8f97b0a2141f5f8530a535b24b2b04dadae31c",
+   "4822897ab8620c5f3600083374f9e36831c96b2c",
    "reftest"
   ],
   "css/css-paint-api/paint-arguments-ref.html": [
    "cbe0372259011ca94f0fd8d233413439ba9cf117",
    "support"
   ],
   "css/css-paint-api/paint-arguments.https.html": [
-   "7acf977d7e09bb85ada1b0df7fd9e4ea3a11ddfe",
+   "364a86396ba71e411ae23a0ff3c0f6b8100b039e",
    "reftest"
   ],
   "css/css-paint-api/paint-function-arguments-ref.html": [
    "a3aebfce59d0f62ab229248b7903b0dc731835d5",
    "support"
   ],
   "css/css-paint-api/paint-function-arguments.https.html": [
-   "cc19f4bc39c7a2cc1d9ed35a6a5a50d3935830af",
+   "a3a7bac75240254b43af5c6803521d8e9f342bab",
    "reftest"
   ],
   "css/css-paint-api/paint2d-composite-ref.html": [
    "60c069de8135b934df166560db5c592d5becbc92",
    "support"
   ],
   "css/css-paint-api/paint2d-composite.https.html": [
-   "bfe095afc5c9a4325b06cfc22414a09395084113",
+   "674d96db571b91ced743d18bf4bb9529bc984a42",
    "reftest"
   ],
   "css/css-paint-api/paint2d-filter-ref.html": [
    "6f1be576ae7ead2a724357b16ea88c92b3b19a0d",
    "support"
   ],
   "css/css-paint-api/paint2d-filter.https.html": [
-   "75d3792f2947cac41657257a8d74d72521c82c7f",
+   "66b99ac471afe4b1d0e2b61d33d17529c4a315da",
    "reftest"
   ],
   "css/css-paint-api/paint2d-gradient-ref.html": [
    "3b2abb3632893c0f5a2714fc325467f0076001a8",
    "support"
   ],
   "css/css-paint-api/paint2d-gradient.https.html": [
-   "57a163232fe53272e9e2d37293908cf7b18267bb",
+   "49d6ba27001cf3c88104cbfa10f30e4757fec091",
    "reftest"
   ],
   "css/css-paint-api/paint2d-image-ref.html": [
    "d4abe5cfd1d2416da7e390d28bc359feac91a2e7",
    "support"
   ],
   "css/css-paint-api/paint2d-image.https.html": [
-   "df6ce0e992726401b8b3eec1ee72029c2f113316",
+   "b40bf2610998b02857c021542116027fde52c9c8",
    "reftest"
   ],
   "css/css-paint-api/paint2d-paths-ref.html": [
    "cf154ab8a37bdbce2175193dfc456f4771bfeca8",
    "support"
   ],
   "css/css-paint-api/paint2d-paths.https.html": [
-   "06e13a31033ace03f012556b59ad3c0ac5cf39c1",
+   "b3f185c78bdc52f6c5bb596248a7b8b81f337337",
    "reftest"
   ],
   "css/css-paint-api/paint2d-rects-ref.html": [
    "2a469427fbdbee6b096a63b95846cdeda92c0255",
    "support"
   ],
   "css/css-paint-api/paint2d-rects.https.html": [
-   "fbb8bf17e5dfd21d87b7d34bdb038e59e16ede46",
+   "1d696296ce1a91fecac2404f3b671ddcb9332cde",
    "reftest"
   ],
   "css/css-paint-api/paint2d-shadows-ref.html": [
    "f882c26b0dfb58fe1ab3177060f421dad0148456",
    "support"
   ],
   "css/css-paint-api/paint2d-shadows.https.html": [
-   "6c7dab36d84540407eeb9571f8a9607e8d27ce6b",
+   "d87f6308521b836ef6ca1d5a480e52d04ad7d5c6",
    "reftest"
   ],
   "css/css-paint-api/paint2d-transform-ref.html": [
    "5eff507eeee563399205645668c7ed3df79213c9",
    "support"
   ],
   "css/css-paint-api/paint2d-transform.https.html": [
-   "f840916bab6d10cff1b08d1cfaecee97699d80cb",
+   "6b8b00ce4b726e07843b5c1ed552db3e85d02240",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-001.https.html": [
-   "0ba1a9978d295825784a2909447e565701e6fc09",
+   "4736591bcaf3b2d9d496f325f5709cbd24ee0d84",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-002.https.html": [
-   "d35b4e39d8b0f54935571ee62fe7255e93c917dd",
+   "a3cc3277704e5c7036a1f04127ea39a873f726a3",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-003.https.html": [
-   "f6c8cb6feba2b14349bc3fa3170b278e698df526",
+   "5ea19b47a28e67d75e598023c92ce0ff06c0be79",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-004.https.html": [
-   "1dd64759c041d9633ce04add066f4e1573fd05e5",
+   "fe30afff3fcfe646b6cd200768f3e404f80af622",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-005.https.html": [
-   "25d32d33e5de6d289d0e8c776876cb66f03e7c2e",
+   "8c1f96a546b788aff4153028c33af08fe13de426",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-006.https.html": [
-   "effa515567b0212403d83588c335d8fc72c056f6",
+   "a5fbccaf088103440586d18812c147af7605e401",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-007.https.html": [
-   "f2f837e7c82462f17d9ebb1a8ab5346e5b8c945c",
+   "f28e6353da3e967a4b563e5bb4d978ad599e9344",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-008.https.html": [
-   "60034209a8984ac0be807494fc4373329d3792eb",
+   "eac2412dec6c73c198bb6f0035947967d46e987b",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-009.https.html": [
-   "d57e2370218d385a02e2021219869b5dec0e45c4",
+   "80e219e76653fbf3470466363dc4790c2219dbe7",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-010.https.html": [
-   "9d4ef380f3596a73ea7816d13b3913b541ec05b9",
+   "284675f2aec06ae04a1ad006ee88e0a2321a7ede",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-011.https.html": [
-   "b464f59c89fd6b515cdb2e027240b953bcf229d8",
+   "d470cd59be239ad2bcb5165e69c75d8b93a60975",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-012.https.html": [
-   "0cc064f143a0b1bed6b6e3b79f9a95754eb60ea3",
+   "5f5af76e9f22f19ad04f4580f6b04591b6b4c6cb",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-013.https.html": [
-   "e4a99687b156723308ed27a9e863754cb6dcdbd2",
+   "14e3abcf590a312e8a5f2fea4e9a1bcec23db4ae",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-014.https.html": [
-   "c10d44a53a00e6a9745d6ea1c359298723a0aee1",
+   "6f858212364f918385ed4e952dbe22dbd28261ab",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-015.https.html": [
-   "a78c728b67af31e47c8d46e60e33ba437769a020",
+   "2fa0c26c03a46b583f9db8362c12de363f551bda",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-016.https.html": [
-   "1c14dbe6c6bc0f218724731112c4c45888ede8b5",
+   "f1629ddc373d8bd76b8e7f925729c6920500a035",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-017.https.html": [
-   "cba3754c5044665b2648fec05e25d7b6028c185f",
+   "ecb703a89b1fcba7f0933e848d279cf431c90a2b",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-018-ref.html": [
    "a831ef2690027b266f499d652b25ed8684e0fbaf",
    "support"
   ],
   "css/css-paint-api/parse-input-arguments-018.https.html": [
-   "2ae9cf7d13fa40e568d2324d060885a68ea3dbbd",
+   "0e918c827285cb1d841d4e9cf162a8df4bb7873e",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-019.https.html": [
-   "db11565957c3da1ca7a51b9ab36cd4a823386a55",
+   "4255d8a07c8af95aa6dc924afe5ff262182d46be",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-020.https.html": [
-   "acbff610abd29a01574add30679b43d7a735c9bd",
+   "673c41e96a7cbbe0c9c4ec98281d1d36a821ad3d",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-021.https.html": [
-   "6f567a29ed4ec26ad8c97277469783a614a5811b",
+   "f4e0fe1b41cfd198a828a48a1202f6bb0c90602b",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-022.https.html": [
-   "9f0efcee3e1412faa19fe50f475623fd5cf2852b",
+   "43b210e27fec1e601eedf1cf8964d185b7f34751",
    "reftest"
   ],
   "css/css-paint-api/parse-input-arguments-ref.html": [
    "6133bd65ef569456f58f1e501d81e088256bdc0a",
    "support"
   ],
   "css/css-paint-api/registered-properties-in-custom-paint.https.html": [
-   "4eee3e45f32779df4464132fa43717a3afc135b2",
+   "de1e6dabe19bdd355060a62c7d697c64f49929fe",
    "reftest"
   ],
   "css/css-paint-api/resources/html5.png": [
    "0b71ad4f2c95d41419082c2f1a2fc8370b14ebd2",
    "support"
   ],
   "css/css-paint-api/style-background-image-ref.html": [
    "0985e20363c8aac715c534ad59f1209889244fb0",
    "support"
   ],
   "css/css-paint-api/style-background-image.https.html": [
-   "4288eba641144a33ba79390102d141693a2c14d6",
+   "c3359a8ee23b9c3d9007066235aef894ddbaf47f",
    "reftest"
   ],
   "css/css-paint-api/style-before-pseudo-ref.html": [
    "6dcbe78ab89343178e18e3e92744b25759ec8241",
    "support"
   ],
   "css/css-paint-api/style-before-pseudo.https.html": [
-   "e491dcde66880750f3b277d520f5288e0508d13a",
+   "cd16dfc6e532851b23abdf47cb4cc89f20a6c655",
    "reftest"
   ],
   "css/css-paint-api/style-first-letter-pseudo-ref.html": [
    "c6a94e5bafa098b8f4023312db97abebe992abc3",
    "support"
   ],
   "css/css-paint-api/style-first-letter-pseudo.https.html": [
-   "75bee076f1fd0629eb7b0064ccf2c6ed882a4fbd",
+   "996d9f2e93bc8ba0a54415d0ffcab4cdb7c1ffa7",
    "reftest"
   ],
   "css/css-paint-api/valid-image-after-load-ref.html": [
    "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
    "support"
   ],
   "css/css-paint-api/valid-image-after-load.https.html": [
-   "c00a13e38ba694a79e4934c854684aaaf0b19068",
+   "ed072976b2054f941dc4653d3318f19b94d52a0c",
    "reftest"
   ],
   "css/css-paint-api/valid-image-before-load-ref.html": [
    "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
    "support"
   ],
   "css/css-paint-api/valid-image-before-load.https.html": [
-   "89d6d44680d1df3fdc7ece62ff7ed2edffbaa01d",
+   "9ddb41d4292ad70c50530c76d6ac505347bec30e",
    "reftest"
   ],
   "css/css-position/position-relative-table-left-ref.html": [
    "044d07924d19f223eaa43950f9e9197d267e6be8",
    "support"
   ],
   "css/css-position/position-relative-table-tbody-left-absolute-child.html": [
    "52021ff94a08452e93b2d9054d9aef69bf32ee0a",
deleted file mode 100644
--- a/testing/web-platform/tests/common/css-paint-tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// To make sure that we take the snapshot at the right time, we do double
-// requestAnimationFrame. In the second frame, we take a screenshot, that makes
-// sure that we already have a full frame.
-function importPaintWorkletAndTerminateTestAfterAsyncPaint(code) {
-    if (typeof CSS.paintWorklet == "undefined") {
-        takeScreenshot();
-    } else {
-        var blob = new Blob([code], {type: 'text/javascript'});
-        CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
-            requestAnimationFrame(function() {
-                requestAnimationFrame(function() {
-                    takeScreenshot();
-                });
-            });
-        });
-    }
-}
-
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/common/worklet-reftest.js
@@ -0,0 +1,18 @@
+// To make sure that we take the snapshot at the right time, we do double
+// requestAnimationFrame. In the second frame, we take a screenshot, that makes
+// sure that we already have a full frame.
+function importWorkletAndTerminateTestAfterAsyncPaint(worklet, code) {
+    if (typeof worklet == "undefined") {
+        takeScreenshot();
+    } else {
+        var blob = new Blob([code], {type: 'text/javascript'});
+        worklet.addModule(URL.createObjectURL(blob)).then(function() {
+            requestAnimationFrame(function() {
+                requestAnimationFrame(function() {
+                    takeScreenshot();
+                });
+            });
+        });
+    }
+}
+
--- a/testing/web-platform/tests/css/css-paint-api/background-image-alpha.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/background-image-alpha.https.html
@@ -16,17 +16,17 @@
 }
 
 #background {
   background-color: yellow;
   display: inline-block;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="background">
   <div id="canvas-opaque" class="container"></div>
   <div id="canvas-nonopaque" class="container"></div>
 </div>
 
 <script id="code" type="text/worklet">
 registerPaint('opaque', class {
@@ -44,12 +44,12 @@ registerPaint('nonOpaque', class {
         ctx.strokeStyle = 'blue';
         ctx.lineWidth = 4;
         ctx.strokeRect(20, 20, 60, 60);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/background-image-multiple.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/background-image-multiple.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 100px;
         height: 100px;
         background-image: paint(n0), paint(n1), paint(n2);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 var colors = ['red', 'green', 'blue'];
 
 for (let i = 0; i < 3; i++) {
     registerPaint('n' + i, class {
@@ -22,12 +22,12 @@ for (let i = 0; i < 3; i++) {
             ctx.fillStyle = colors[i];
             ctx.fillRect(i * 20, i * 20, 40, 40);
         }
     });
 }
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/background-image-tiled.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/background-image-tiled.https.html
@@ -16,29 +16,29 @@
 
     #two {
         background:
             paint(ellipse) top left/50% 20% repeat-y,
             paint(ellipse) center right/50% 50% no-repeat;
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="one"></div>
 <div id="two"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('ellipse', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.beginPath();
         ctx.rect(0, 0, geom.width, geom.height);
         ctx.fill();
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-background-image-001.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-background-image-001.https.html
@@ -8,27 +8,27 @@ html, body { margin: 0; padding: 0; }
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         ctx.strokeStyle = 'green';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-background-image-002.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-background-image-002.https.html
@@ -8,27 +8,27 @@ html, body { margin: 0; padding: 0; }
   height: 200px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         ctx.strokeStyle = 'green';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-001.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-001.https.html
@@ -9,28 +9,28 @@ html, body { margin: 0; padding: 0; }
   background: paint(geometry) top left/50% 50% repeat-x;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.beginPath();
         ctx.rect(0, 0, geom.width, geom.height);
         ctx.fill();
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-002.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-002.https.html
@@ -9,27 +9,27 @@ html, body { margin: 0; padding: 0; }
   background: paint(geometry) center right/50% 20% no-repeat;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         ctx.strokeStyle = 'green';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-003.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-background-image-tiled-003.https.html
@@ -9,27 +9,27 @@ html, body { margin: 0; padding: 0; }
   background: paint(geometry) center center/60px 80px no-repeat;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         ctx.strokeStyle = 'green';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-border-image-001.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-border-image-001.https.html
@@ -10,17 +10,17 @@ html, body { margin: 0; padding: 0; }
 
 #canvas-geometry {
   border: solid 0;
   border-image: paint(geometry);
   border-image-slice: 0 fill;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         if (geom.width == 220 && geom.height == 220)
             ctx.strokeStyle = 'green';
@@ -29,12 +29,12 @@ registerPaint('geometry', class {
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
     document.getElementById('canvas-geometry').style.borderWidth = '10px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-border-image-002.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-border-image-002.https.html
@@ -10,17 +10,17 @@ html, body { margin: 0; padding: 0; }
 
 #canvas-geometry {
   border: solid 0;
   border-image: paint(geometry);
   border-image-slice: 0 fill;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         if (geom.width == 90 && geom.height == 90)
             ctx.strokeStyle = 'green';
@@ -29,12 +29,12 @@ registerPaint('geometry', class {
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
     document.getElementById('canvas-geometry').style.borderImageOutset = '20px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-border-image-003.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-border-image-003.https.html
@@ -10,17 +10,17 @@ html, body { margin: 0; padding: 0; }
 
 #canvas-geometry {
   border: solid 0;
   border-image: paint(geometry);
   border-image-slice: 0 fill;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         if (geom.width == 80 && geom.height == 120)
             ctx.strokeStyle = 'green';
@@ -29,12 +29,12 @@ registerPaint('geometry', class {
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
     document.getElementById('canvas-geometry').style.borderImageOutset = '10px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-border-image-004.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-border-image-004.https.html
@@ -10,17 +10,17 @@ html, body { margin: 0; padding: 0; }
 
 #canvas-geometry {
   border: solid 0;
   border-image: paint(geometry);
   border-image-slice: 0 fill;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         if (geom.width == 140 && geom.height == 140)
             ctx.strokeStyle = 'green';
@@ -30,12 +30,12 @@ registerPaint('geometry', class {
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
     document.getElementById('canvas-geometry').style.borderWidth = '10px';
     document.getElementById('canvas-geometry').style.borderImageOutset = '10px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/geometry-with-float-size.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/geometry-with-float-size.https.html
@@ -7,29 +7,29 @@
   width: 100.5px;
   height: 200.5px;
 }
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     paint(ctx, geom) {
         if (geom.width == 101 && geom.height == 201)
             ctx.fillStyle = 'green';
         else
             ctx.fillStyle = 'red';
         ctx.fillRect(0, 0, 50, 50);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html
@@ -8,17 +8,17 @@ html, body { margin: 0; padding: 0; }
   height: 150px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <p>This test ensures that the PaintWorkletGlobalScope.devicePixelRatio returns
 the correct value, which should be identical as window.devicePixelRatio. To
 manually test, open both this file and "device-pixel-ratio-ref.html" with a
 browser, and you should see two idential green rectangles.</p>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
@@ -28,12 +28,12 @@ registerPaint('geometry', class {
         var draw_width = Math.floor(geom.width / devicePixelRatio);
         var draw_height = Math.floor(geom.height / devicePixelRatio);
         ctx.fillRect(0, 0, draw_width, draw_height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/invalid-image-constructor-error.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/invalid-image-constructor-error.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 100px;
         height: 100px;
         background-image: paint(errorIndicator), paint(successIndicator);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('errorIndicator', class {
     constructor() { throw Error('failed!'); }
     // The paint function should not be executed because an error has been
     // thrown.
@@ -28,13 +28,13 @@ registerPaint('successIndicator', class 
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(50, 50, 50, 50);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/invalid-image-paint-error.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/invalid-image-paint-error.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 100px;
         height: 100px;
         background-image: paint(errorIndicator), paint(successIndicator);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('errorIndicator', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'red';
         ctx.fillRect(0, 0, geom.width, geom.height);
@@ -25,12 +25,12 @@ registerPaint('successIndicator', class 
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/invalid-image-pending-script.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/invalid-image-pending-script.https.html
@@ -4,29 +4,29 @@
 <style>
     #output {
         width: 100px;
         height: 100px;
         background-image: paint(invalid), paint(successIndicator);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 // This is testing that even though there is no paint function registered for
 // 'invalid', it won't cause any error, and the other painter (successIndicator)
 // will paint as usual.
 registerPaint('successIndicator', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/overdraw.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/overdraw.https.html
@@ -5,26 +5,26 @@
     #output {
         width: 100px;
         height: 100px;
         background-image: paint(green);
         background-color: red;
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('green', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(-10, -10, geom.width + 20, geom.height + 20);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint-arguments.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint-arguments.https.html
@@ -16,17 +16,17 @@
 }
 
 #background {
   background-color: yellow;
   display: inline-block;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 
 <div id="background">
   <div id="canvas-box-green" class="container"></div>
   <div id="canvas-box-red" class="container"></div>
 </div>
 
 <script id="code" type="text/worklet">
@@ -38,12 +38,12 @@ registerPaint('box', class {
         ctx.lineWidth = 4;
         ctx.strokeRect(20, 20, 60, 60);
     }
 });
 
 </script>
 
 <script>
-  importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+  importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint-function-arguments.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint-function-arguments.https.html
@@ -16,17 +16,17 @@
 }
 
 #background {
   background-color: yellow;
   display: inline-block;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 
 <div id="background">
   <div id="canvas-box-1" class="container"></div>
   <div id="canvas-box-2" class="container"></div>
 </div>
 
 <script id="code" type="text/worklet">
@@ -38,12 +38,12 @@ registerPaint('box', class {
         ctx.lineWidth = args[1].toString();
         ctx.strokeRect(40, 40, 120, 120);
     }
 });
 
 </script>
 
 <script>
-  importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+  importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-composite.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-composite.https.html
@@ -14,17 +14,17 @@
     #destination-over { background-image: paint(destination-over); }
     #destination-in { background-image: paint(destination-in); }
     #destination-out { background-image: paint(destination-out); }
     #destination-atop { background-image: paint(destination-atop); }
     #lighter { background-image: paint(lighter); }
     #xor { background-image: paint(xor); }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="source-over"></div>
 <div id="source-in"></div>
 <div id="source-out"></div>
 <div id="source-atop"></div>
 <br>
 <div id="destination-over"></div>
 <div id="destination-in"></div>
@@ -62,12 +62,12 @@ function doPaint(ctx, op) {
 
 for (var i = 0; i < compositeOps.length; i++) {
     let op = compositeOps[i];
     registerPaint(op, class { paint(ctx, geom) { doPaint(ctx, op); } });
 }
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-filter.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-filter.https.html
@@ -19,17 +19,17 @@
     #filter-invert { background-image: paint(filter-invert); }
     #filter-opacity { background-image: paint(filter-opacity); }
     #filter-saturate { background-image: paint(filter-saturate); }
     #filter-sepia { background-image: paint(filter-sepia); }
     #filter-hue-rotate { background-image: paint(filter-hue-rotate); }
     #filter-url { background-image: paint(filter-url); }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="filter-none"></div>
 <div id="filter-blur-10px"></div>
 <div id="filter-blur-50vh"></div>
 <div id="filter-blur-1em"></div>
 <div id="filter-blur-2percent"></div>
 <br>
 <div id="filter-brightness"></div>
@@ -95,12 +95,12 @@ function doPaint(ctx, op) {
 
 for (var i = 0; i < filterOps.length; i++) {
   let op = filterOps[i];
   registerPaint(paintNames[i], class { paint(ctx, geom) { doPaint(ctx, op); } });
 }
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-gradient.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-gradient.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 200px;
         height: 100px;
         background-image: paint(gradients);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('gradients', class {
     paint(ctx, geom) {
         var linearGradient = ctx.createLinearGradient(0, 0, 100, 100);
         linearGradient.addColorStop(0, 'blue');
@@ -29,12 +29,12 @@ registerPaint('gradients', class {
         radialGradient.addColorStop(1, 'white');
         ctx.fillStyle = radialGradient;
         ctx.fillRect(100, 0, 100, 100);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-image.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-image.https.html
@@ -5,26 +5,26 @@
 #output {
     width: 300px;
     height: 300px;
     background-image: paint(image);
     border-image: url("./resources/html5.png");
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
     registerPaint('image', class {
         static get inputProperties() { return [ 'border-image-source' ]; };
         paint(ctx, geom, styleMap) {
             ctx.fillStyle = 'green';
             ctx.fillRect(0, 0, geom.width, geom.height);
             ctx.drawImage(styleMap.get('border-image-source'), 0, 0);
         }
     });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-paths.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-paths.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 300px;
         height: 400px;
         background-image: paint(paths);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('paths', class {
     paint(ctx, geom) {
         ctx.beginPath();
         ctx.lineWidth = '10';
@@ -37,12 +37,12 @@ registerPaint('paths', class {
         ctx.arc(75, 325, 50, 0, Math.PI * 2, true);
         ctx.arc(75, 325, 20, 0, Math.PI * 2, true);
         ctx.fill('evenodd');
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-rects.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-rects.https.html
@@ -5,17 +5,17 @@
     #output {
         width: 100px;
         height: 100px;
         background-image: paint(rects);
         background-color: blue;
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('rects', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(0, 0, geom.width, geom.height);
@@ -25,12 +25,12 @@ registerPaint('rects', class {
         ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(20, 20, 60, 60);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-shadows.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-shadows.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 200px;
         height: 100px;
         background-image: paint(shadows);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('shadows', class {
     paint(ctx, geom) {
         ctx.shadowColor = 'black';
         ctx.shadowOffsetY = 10;
@@ -28,12 +28,12 @@ registerPaint('shadows', class {
         ctx.shadowOffsetY = 5;
         ctx.fillStyle = 'green';
         ctx.fillRect(110, 10, 50, 50);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/paint2d-transform.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/paint2d-transform.https.html
@@ -4,17 +4,17 @@
 <style>
     #output {
         width: 200px;
         height: 200px;
         background-image: paint(transform);
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('transform', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.transform(1, 0.5, 0, 1, 20, 20);
@@ -27,12 +27,12 @@ registerPaint('transform', class {
         ctx.rotate(60 * Math.PI / 180);
         ctx.scale(1.5, 1);
         ctx.fillRect(0, 0, 50, 50);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-001.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-001.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo', class {
         static get inputArguments() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo1', class {
         static get inputArguments() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo2', class {
         static get inputArguments() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-004.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-004.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo3', class {
         static get inputArguments() {
@@ -38,12 +38,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo', class { paint() { } });
     registerPaint('foo', class { paint() { } });
@@ -34,12 +34,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('', class { });
 } catch(ex) {
@@ -33,12 +33,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-007.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-007.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo3', class {
         static get inputProperties() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo4', class {
         static get inputProperties() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     var a = function() { };
     a.prototype = undefined;
@@ -35,12 +35,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     var b = function() { };
     b.prototype = 42;
@@ -35,12 +35,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo7', class { });
 } catch(ex) {
@@ -33,12 +33,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo8', class {
         get paint() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-013.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-013.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo9', class { paint() { } });
     testsPassed = true;
@@ -33,12 +33,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-014.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-014.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     var c = function() { };
     c.prototype.paint = function() { };
@@ -35,12 +35,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-015.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-015.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo11', class {
         static get inputProperties() {
@@ -38,12 +38,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo12', class {
         static get contextOptions() {
@@ -37,12 +37,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-017.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-017.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo13', class {
         static get contextOptions() { return {alpha: true}; }
@@ -36,12 +36,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-018.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-018.https.html
@@ -8,17 +8,17 @@
 }
 
 #canvas-geometry {
     border:1px solid black;
     background-image: paint(failureIndicator), paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <p>This test result should show a rect with black border, where the rect is
 filled with green on the lower right corner. The registerPaint('failureIndicator')
 will be called twice and the inputArguments will return two different strings,
 which will throw an exception and the paint function with 'failureIndicator'
 should never be called. In other words, there should be no red painted in the result.</p>
 <div id="canvas-geometry" class="container"></div>
 
@@ -58,12 +58,12 @@ registerPaint('geometry', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(50, 50, 50, 50);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-019.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-019.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo', class {
         static get contextOptions() { return {alpha: 42}; }
@@ -36,12 +36,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-020.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-020.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo', class {
         paint() {}
@@ -35,12 +35,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-021.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-021.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo', class {
         // Setting anything other than alpha should not throw exception, and
@@ -38,12 +38,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-022.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-022.https.html
@@ -7,17 +7,17 @@
   height: 100px;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 var testsPassed = false;
 try {
     registerPaint('foo', class {
         static get contextOptions() { return null; }
@@ -36,12 +36,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'red';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/registered-properties-in-custom-paint.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/registered-properties-in-custom-paint.https.html
@@ -9,17 +9,17 @@
   --number: 10;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     static get inputProperties() {
         return [
             '--length',
@@ -51,12 +51,12 @@ registerPaint('geometry', class {
     }
 });
 </script>
 
 <script>
     CSS.registerProperty({name: '--length', syntax: '<length>', initialValue: '0px'});
     CSS.registerProperty({name: '--length-initial', syntax: '<length>', initialValue: '20px'});
     CSS.registerProperty({name: '--number', syntax: '<number>', initialValue: '0'});
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/style-background-image.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/style-background-image.https.html
@@ -9,17 +9,17 @@
   --foo: bar;
 }
 
 #canvas-geometry {
   background-image: paint(geometry);
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body>
 <div id="canvas-geometry" class="container"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     static get inputProperties() {
         return [
             '--bar',
@@ -51,12 +51,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'cyan';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/style-before-pseudo.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/style-before-pseudo.https.html
@@ -13,17 +13,17 @@ div::before {
     color: rgba(0, 0, 0, 0);
 
     background-image: paint(geometry);
     border-radius: 2px;
     --foo: bar;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body style="font: 10px/1 Ahem;">
 <div></div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     static get inputProperties() {
         return [
             '--bar',
@@ -52,12 +52,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'yellow';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/style-first-letter-pseudo.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/style-first-letter-pseudo.https.html
@@ -10,17 +10,17 @@ div {
 
 div::first-letter {
     background-image: paint(geometry);
     color: rgb(255, 0, 0);
     line-height: 2px;
 }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
+<script src="/common/worklet-reftest.js"></script>
 <body style="font: 10px/1 Ahem;">
 <div>ppp</div>
 
 <script id="code" type="text/worklet">
 registerPaint('geometry', class {
     static get inputProperties() {
         return [
             'color',
@@ -46,12 +46,12 @@ registerPaint('geometry', class {
             ctx.strokeStyle = 'blue';
         ctx.lineWidth = 4;
         ctx.strokeRect(0, 0, geom.width, geom.height);
     }
 });
 </script>
 
 <script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-paint-api/valid-image-after-load.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/valid-image-after-load.https.html
@@ -4,17 +4,16 @@
 <style>
     #output {
         width: 100px;
         height: 100px;
         background-color: red;
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('green', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(0, 0, geom.width, geom.height);
--- a/testing/web-platform/tests/css/css-paint-api/valid-image-before-load.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/valid-image-before-load.https.html
@@ -4,17 +4,16 @@
 <style>
     #output {
         width: 100px;
         height: 100px;
         background-color: red;
     }
 </style>
 <script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
 <body>
 <div id="output"></div>
 
 <script id="code" type="text/worklet">
 registerPaint('green', class {
     paint(ctx, geom) {
         ctx.fillStyle = 'green';
         ctx.fillRect(0, 0, geom.width, geom.height);