From 909e31e1106083c1d27aa775047122fd643c527d Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Fri, 1 May 2020 08:18:56 +0000
Subject: [PATCH] Update web-platform-tests to revision
 dfe0b490c6018fd36379f4c7726f9f6a37728838

---
 .../url/url-in-tags-revoke.window.js.ini      |   2 +-
 .../CSS2/floats/hit-test-floats-004.html.ini  |   4 -
 ...space-separators-break-spaces-004.html.ini |   2 +
 ...QueryList-addListener-handleEvent.html.ini |   9 -
 .../elementFromPoint-list-001.html.ini        |  15 -
 .../offsetTopLeft-border-box.html.ini         |  85 -----
 .../fetch/content-type/response.window.js.ini |  21 +-
 .../fetch/content-type/script.window.js.ini   |   3 +
 .../traverse_the_history_1.html.ini           |   4 +
 ...height-orientation-none.tentative.html.ini |   2 +
 ...itmap-swap-width-height.tentative.html.ini |   2 +
 ...ement-swap-width-height.tentative.html.ini |   2 +
 .../supported-elements.html.ini               |  12 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |   1 +
 ...rame_sandbox_popups_nonescaping-1.html.ini |   1 +
 ...rame_sandbox_popups_nonescaping-3.html.ini |   3 +-
 .../relevant-mutations.html.ini               |  67 ++++
 .../parsing/DOMContentLoaded-defer.html.ini   |   4 +
 ...le-event-handler-settings-objects.html.ini |   3 -
 ...ob-entry-different-function-realm.html.ini |  16 +
 .../iframe-inheritance-about-blank.html.ini   |   7 +
 .../realtimeanalyser-fft-scaling.html.ini     |   1 -
 .../audiobuffersource-multi-channels.html.ini |   3 +
 .../audiocontextoptions.html.ini              |  13 +
 .../webmessaging/without-ports/017.html.ini   |   5 +
 .../webmessaging/without-ports}/018.html.ini  |   0
 .../url/url-in-tags-revoke.window.js.ini      |   2 +-
 tests/wpt/metadata/MANIFEST.json              | 348 +++++++++---------
 .../CSS2/floats/hit-test-floats-001.html.ini  |   4 +
 .../CSS2/floats/hit-test-floats-002.html.ini  |   4 -
 .../CSS2/floats/hit-test-floats-003.html.ini  |   4 -
 .../CSS2/floats/hit-test-floats-004.html.ini  |   4 -
 .../inline-negative-margin-001.html.ini       |   5 +-
 ...space-separators-break-spaces-004.html.ini |   2 +
 .../css-transform-scale-001.html.ini          |   3 -
 ...QueryList-addListener-handleEvent.html.ini |   3 -
 .../elementFromPoint-list-001.html.ini        |   3 -
 .../offsetTopLeft-border-box.html.ini         |   7 -
 .../fetch/content-type/response.window.js.ini |  11 +-
 .../fetch/content-type/script.window.js.ini   |   3 +
 .../traverse_the_history_1.html.ini           |   4 +
 .../traverse_the_history_2.html.ini           |   4 +
 .../traverse_the_history_5.html.ini           |   4 +
 ...height-orientation-none.tentative.html.ini |   2 +
 ...itmap-swap-width-height.tentative.html.ini |   2 +
 ...ement-swap-width-height.tentative.html.ini |   2 +
 .../offscreencanvas.convert.to.blob.html.ini  |   3 +
 .../supported-elements.html.ini               |  12 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |   2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |   2 +-
 ...rame_sandbox_popups_nonescaping-3.html.ini |   3 +-
 .../relevant-mutations.html.ini               |  36 ++
 .../parsing/DOMContentLoaded-defer.html.ini   |   4 +
 ...le-event-handler-settings-objects.html.ini |   3 -
 ...ob-entry-different-function-realm.html.ini |   5 +-
 .../iframe-inheritance-about-blank.html.ini   |   7 +
 .../realtimeanalyser-fft-scaling.html.ini     |   1 -
 .../audiobuffersource-multi-channels.html.ini |   3 +
 .../audiocontextoptions.html.ini              |   1 -
 .../webmessaging/without-ports/017.html.ini   |   5 +
 .../webmessaging/without-ports/018.html.ini   |   5 +
 .../webxr/getInputPose_pointer.https.html.ini |   4 -
 ...ReferenceSpace_originOffset.https.html.ini |   4 -
 .../Worker/Worker-constructor.html.ini        |   2 -
 ...d-worker-in-data-url-context.window.js.ini |   3 +-
 .../scope/template/worker.js.template         |   5 -
 .../security-features/subresource/referrer.py |   4 +
 .../css-border-radius-001.html                |   4 +-
 .../css-border-radius-002.html                |   1 -
 .../css-backgrounds/css-box-shadow-001.html   |   2 -
 ... => flex-direction-column-001-visual.html} |   0
 ...-direction-column-reverse-001-visual.html} |   0
 ...-direction-column-reverse-002-visual.html} |   0
 ...tml => flex-direction-row-001-visual.html} |   0
 ...tml => flex-direction-row-002-visual.html} |   0
 ...lex-direction-row-reverse-001-visual.html} |   0
 ...lex-direction-row-reverse-002-visual.html} |   0
 ...ebkit-line-clamp-with-line-height-ref.html |   0
 ...line-clamp-with-line-height.tentative.html |   2 +-
 ...ml => css-transform-scale-001-manual.html} |   1 -
 ...rom-bitmap-orientation-none.tentative.html |   6 +-
 ...dth-height-orientation-none.tentative.html |   6 +-
 ...om-bitmap-swap-width-height.tentative.html |   6 +-
 .../drawImage-from-bitmap.tentative.html      |   6 +-
 ...om-element-orientation-none.tentative.html |   4 +-
 ...dth-height-orientation-none.tentative.html |   4 +-
 ...m-element-swap-width-height.tentative.html |   4 +-
 .../drawImage-from-element.tentative.html     |   4 +-
 ...mage-from-bitmap-orientation-none-ref.html |   6 +-
 .../reference/drawImage-from-bitmap-ref.html  |   6 +-
 ...wap-width-height-orientation-none-ref.html |   6 +-
 ...age-from-bitmap-swap-width-height-ref.html |   6 +-
 .../reference/drawImage-from-blob-ref.html    |   4 +-
 ...age-from-element-orientation-none-ref.html |   6 +-
 .../reference/drawImage-from-element-ref.html |   6 +-
 ...wap-width-height-orientation-none-ref.html |   6 +-
 ...ge-from-element-swap-width-height-ref.html |   6 +-
 .../popup-with-structured-header.https.html   |  21 ++
 ...-with-structured-header.https.html.headers |   1 +
 .../the-img-element/relevant-mutations.html   | 160 ++++++++
 .../resources/script-text-modifications.py    |   9 -
 .../script-text-modifications.html            |  15 +-
 .../interfaces/webauthn.idl                   |   5 +-
 .../periodic-background-sync/META.yml         |   4 +
 .../idlharness.https.any.js                   |   2 +-
 .../periodicsync.https.window.js              |   0
 .../service_workers/sw.js                     |   0
 .../iframe-inheritance-about-blank.html       | 104 ++++++
 .../chromium/webxr-test-math-helper.js        |   9 +
 .../resources/chromium/webxr-test.js          |  91 ++---
 .../tools/ci/ci_wptrunner_infrastructure.sh   |  10 +-
 .../webrtc/RTCPeerConnection-helper.js        |   1 -
 .../webrtc/simulcast/basic.https.html         |  39 +-
 .../webrtc/simulcast/getStats.https.html      |  59 ++-
 .../webrtc/simulcast/simulcast.js             |  41 +++
 .../ar_dom_overlay_hit_test.https.html        |   2 +-
 .../webxr/getInputPose_pointer.https.html     |  17 +-
 ...ttest_subscription_inputSources.https.html |  13 +-
 ...scription_transientInputSources.https.html |  13 +-
 .../webxr/resources/webxr_test_constants.js   |  13 +-
 .../xrReferenceSpace_originOffset.https.html  |  18 +-
 ...erenceSpace_originOffsetBounded.https.html |   2 +-
 .../rendering/draw-buffers.html.ini           |  27 ++
 123 files changed, 987 insertions(+), 613 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
 rename tests/wpt/{metadata/webmessaging/with-ports => metadata-layout-2020/webmessaging/without-ports}/018.html.ini (100%)
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-transforms/css-transform-scale-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini
 create mode 100644 tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini
 create mode 100644 tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini
 create mode 100644 tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/without-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini
 delete mode 100644 tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini
 delete mode 100644 tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/web-platform-tests/common/security-features/subresource/referrer.py
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction_column.html => flex-direction-column-001-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction_column-reverse.html => flex-direction-column-reverse-001-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction-column-reverse.html => flex-direction-column-reverse-002-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction_row.html => flex-direction-row-001-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction-row.html => flex-direction-row-002-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction_row-reverse.html => flex-direction-row-reverse-001-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-flexbox/{flex-direction-row-reverse.html => flex-direction-row-reverse-002-visual.html} (100%)
 rename tests/wpt/web-platform-tests/css/css-overflow/{webkit-line-clamp => reference}/webkit-line-clamp-with-line-height-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-overflow/{webkit-line-clamp => }/webkit-line-clamp-with-line-height.tentative.html (88%)
 rename tests/wpt/web-platform-tests/css/css-transforms/{css-transform-scale-001.html => css-transform-scale-001-manual.html} (97%)
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/script-text-modifications.py
 create mode 100644 tests/wpt/web-platform-tests/periodic-background-sync/META.yml
 rename tests/wpt/web-platform-tests/{PeriodicBackgroundSync => periodic-background-sync}/idlharness.https.any.js (91%)
 rename tests/wpt/web-platform-tests/{PeriodicBackgroundSync => periodic-background-sync}/periodicsync.https.window.js (100%)
 rename tests/wpt/web-platform-tests/{PeriodicBackgroundSync => periodic-background-sync}/service_workers/sw.js (100%)
 create mode 100644 tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini
new file mode 100644
index 00000000000..3257d1b4d49
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini
@@ -0,0 +1,2 @@
+[trailing-other-space-separators-break-spaces-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
index 434378ac0a7..a6c39d50087 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
@@ -2,18 +2,9 @@
   [throws if handleEvent is falsy and not callable]
     expected: FAIL
 
-  [looks up handleEvent method on every event dispatch]
-    expected: FAIL
-
-  [calls handleEvent method of event listener]
-    expected: FAIL
-
   [rethrows errors when getting handleEvent]
     expected: FAIL
 
-  [doesn't look up handleEvent method on callable event listeners]
-    expected: FAIL
-
   [throws if handleEvent is thruthy and not callable]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
index 2000dec9a5e..aa65728d945 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -1,16 +1,7 @@
 [elementFromPoint-list-001.html]
-  [<li>Image Inside 2</li>]
-    expected: FAIL
-
   [<li>Image Outside 2</li>]
     expected: FAIL
 
-  [<li>Image Inside 1</li>]
-    expected: FAIL
-
-  [<li>Inside 1</li>]
-    expected: FAIL
-
   [<li>Outside 2</li>]
     expected: FAIL
 
@@ -23,9 +14,3 @@
   [<li>Outside 1</li>]
     expected: FAIL
 
-  [<li>Inside 2</li>]
-    expected: FAIL
-
-  [<li>Inside 3</li>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 3bd0a5266dd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 11]
-    expected: FAIL
-
-  [container: 10]
-    expected: FAIL
-
-  [container: 13]
-    expected: FAIL
-
-  [container: 12]
-    expected: FAIL
-
-  [container: 15]
-    expected: FAIL
-
-  [container: 14]
-    expected: FAIL
-
-  [container: 17]
-    expected: FAIL
-
-  [container: 16]
-    expected: FAIL
-
-  [container: 19]
-    expected: FAIL
-
-  [container: 18]
-    expected: FAIL
-
-  [container: 9]
-    expected: FAIL
-
-  [container: 8]
-    expected: FAIL
-
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
-  [container: 3]
-    expected: FAIL
-
-  [container: 2]
-    expected: FAIL
-
-  [container: 5]
-    expected: FAIL
-
-  [container: 4]
-    expected: FAIL
-
-  [container: 7]
-    expected: FAIL
-
-  [container: 6]
-    expected: FAIL
-
-  [container: 20]
-    expected: FAIL
-
-  [container: 21]
-    expected: FAIL
-
-  [container: 22]
-    expected: FAIL
-
-  [container: 23]
-    expected: FAIL
-
-  [container: 24]
-    expected: FAIL
-
-  [container: 25]
-    expected: FAIL
-
-  [container: 26]
-    expected: FAIL
-
-  [container: 27]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index ab3d00cb8f1..9d6bf00a31f 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,27 +312,18 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 5c001592859..c7413d589dc 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -59,3 +59,6 @@
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252  text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini
new file mode 100644
index 00000000000..6ae80ba13ca
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini
@@ -0,0 +1,2 @@
+[drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini
new file mode 100644
index 00000000000..a74d6e4189c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini
@@ -0,0 +1,2 @@
+[drawImage-from-bitmap-swap-width-height.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini
new file mode 100644
index 00000000000..10bab447002
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini
@@ -0,0 +1,2 @@
+[drawImage-from-element-swap-width-height.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f45aaafe1c5..af14e19a466 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,16 +1,20 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Element with tabindex should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [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-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 4df5d7a35de..daa518bd0e3 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 1b74d6e073d..0c89d5253df 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 7a36937927c..f4f994c5d6f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
new file mode 100644
index 00000000000..ddc87ddb405
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
@@ -0,0 +1,67 @@
+[relevant-mutations.html]
+  [referrerpolicy no-referrer-when-downgrade to empty, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer-when-downgrade to no-referrer, src already set]
+    expected: FAIL
+
+  [ancestor picture; previous sibling source inserted]
+    expected: FAIL
+
+  [picture is inserted; img has previous sibling source]
+    expected: FAIL
+
+  [referrerpolicy absent to no-referrer-when-downgrade, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer-when-downgrade to absent, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to invalid, src already set]
+    expected: FAIL
+
+  [ancestor picture; previous sibling source removed]
+    expected: FAIL
+
+  [crossorigin state not changed: empty to anonymous]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to no-referrer-when-downgrade, src already set]
+    expected: FAIL
+
+  [referrerpolicy empty to no-referrer-when-downgrade, src already set]
+    expected: FAIL
+
+  [picture is inserted; img has following sibling source]
+    expected: FAIL
+
+  [picture is inserted; img has src]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to empty, src already set]
+    expected: FAIL
+
+  [referrerpolicy absent to no-referrer, src already set]
+    expected: FAIL
+
+  [crossorigin state not changed: use-credentials to USE-CREDENTIALS]
+    expected: FAIL
+
+  [referrerpolicy no-referrer-when-downgrade to invalid, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to absent, src already set]
+    expected: FAIL
+
+  [crossorigin state not changed: anonymous to foobar]
+    expected: FAIL
+
+  [referrerpolicy empty to no-referrer, src already set]
+    expected: FAIL
+
+  [srcset is set to same value]
+    expected: FAIL
+
+  [picture is inserted; img has srcset]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
new file mode 100644
index 00000000000..297595743a6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -0,0 +1,16 @@
+[promise-job-entry-different-function-realm.html]
+  [Fulfillment handler on fulfilled promise]
+    expected: FAIL
+
+  [Rejection handler on pending-then-rejected promise]
+    expected: FAIL
+
+  [Thenable resolution]
+    expected: FAIL
+
+  [Rejection handler on rejected promise]
+    expected: FAIL
+
+  [Fulfillment handler on pending-then-fulfilled promise]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
new file mode 100644
index 00000000000..e677ad7aa84
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
@@ -0,0 +1,7 @@
+[iframe-inheritance-about-blank.html]
+  [The value of document.referrer in an about:blank iframe is the outer document's full URL, regardless of referrer policy]
+    expected: FAIL
+
+  [The fetch() API in an about:blank iframe with a custom URL referrer is fetched with a 'Referer` header that uses the outer document's URL along with its referrer policy]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 5e772e6fd0e..e83bdad0f9f 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -116,3 +116,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 40538 more errors.\n\tMax AbsError of 1.9999977350234985e+0 at index of 10361.\n\t[10361\]\t9.9999773502349854e-1\t-1.0000000000000000e+0\t1.9999977350234985e+0\t1.9999977350234985e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 7056.\n\t[7056\]\t5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44054 more errors.\n\tMax AbsError of 1.9961981773376465e+0 at index of 31768.\n\t[31768\]\t-9.9879217147827148e-1\t9.9740600585937500e-1\t1.9961981773376465e+0\t2.0013897706758867e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
new file mode 100644
index 00000000000..b28bd566f16
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
@@ -0,0 +1,13 @@
+[audiocontextoptions.html]
+  [X context = new AudioContext({sampleRate: 1}) did not throw an exception.]
+    expected: FAIL
+
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 3 tasks were failed.]
+    expected: FAIL
+
+  [X context = new AudioContext({sampleRate: 1000000}) did not throw an exception.]
+    expected: FAIL
+
+  [< [test-audiocontextoptions-sampleRate\] 2 out of 4 assertions were failed.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/with-ports/018.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 04cad9b9ba7..09c8489b3c8 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -10832,6 +10832,15 @@
       ]
      ]
     },
+    "css-transforms": {
+     "css-transform-scale-001-manual.html": [
+      "777951d49647d3c47bc6b6b2fcea72fa2296eaab",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-transitions": {
      "transition-delay-000-manual.html": [
       "b205085997ced154dd81e5085dbc6a0cfce19045",
@@ -122516,7 +122525,7 @@
       ]
      ],
      "css-border-radius-001.html": [
-      "1717f677f383ece34e8c8fbcbe97a2895ed60af4",
+      "7bf4830fa1b00d3830e9e2504032c0945b7ab1c0",
       [
        null,
        [
@@ -122529,7 +122538,7 @@
       ]
      ],
      "css-border-radius-002.html": [
-      "d13f4b28b4c8eff3f78cf5067dd0e1a030a1636d",
+      "50adb24133acfcefc993307316f4c4bb96ec24d2",
       [
        null,
        [
@@ -122542,7 +122551,7 @@
       ]
      ],
      "css-box-shadow-001.html": [
-      "0bcedf4c37ebcc7461e7b98cabda8d765b3ef3f7",
+      "e6506e00f0e483ab68a7cd0695983c995058ee5a",
       [
        null,
        [
@@ -155827,21 +155836,6 @@
        {}
       ]
      ],
-     "webkit-line-clamp": {
-      "webkit-line-clamp-with-line-height.tentative.html": [
-       "94a62a5b3fa1291683e4a653d0dd5cf71eea0aca",
-       [
-        null,
-        [
-         [
-          "/css/css-overflow/webkit-line-clamp/webkit-line-clamp-with-line-height-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ]
-     },
      "webkit-line-clamp-001.html": [
       "bba3d1c49f2dab5055fbceb7313659f463454166",
       [
@@ -156283,6 +156277,19 @@
        ],
        {}
       ]
+     ],
+     "webkit-line-clamp-with-line-height.tentative.html": [
+      "a82635f986b60ff4853785dc40b7bbe985af4eb1",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "css-paint-api": {
@@ -179017,19 +179024,6 @@
        {}
       ]
      ],
-     "css-transform-scale-001.html": [
-      "7f5735ae58f58107bc28c2fa7bccc956559e00e6",
-      [
-       null,
-       [
-        [
-         "/css/css-transforms/reference/css-transform-scale-ref-001.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "css-transform-scale-002.html": [
       "08ebcc6b961519f8273e5cd68a403769fee65cbf",
       [
@@ -228127,7 +228121,7 @@
        ],
        "image-orientation": {
         "drawImage-from-bitmap-orientation-none.tentative.html": [
-         "f629caf27f0c6a4353443a37b5a6618606f193b4",
+         "46ce92e3e05c33c2a1ebca7d7fff1edf97d4cde4",
          [
           null,
           [
@@ -228140,7 +228134,7 @@
          ]
         ],
         "drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html": [
-         "2e88ae2e604209130c3318c7cd347f436cad10d9",
+         "efa3d90dbc33f80d16d9405fc58405390ab22182",
          [
           null,
           [
@@ -228153,7 +228147,7 @@
          ]
         ],
         "drawImage-from-bitmap-swap-width-height.tentative.html": [
-         "bca00b3825678a8211c40fd6714b4a5d80b482bd",
+         "eabca5faef37a865b9e854f5c25dfbd261c06b46",
          [
           null,
           [
@@ -228166,7 +228160,7 @@
          ]
         ],
         "drawImage-from-bitmap.tentative.html": [
-         "2014f9c5a2f349986c01ff32b129764246266e64",
+         "641d0ccca9e74f88b21b64d9ab551ce60e8703e0",
          [
           null,
           [
@@ -228192,7 +228186,7 @@
          ]
         ],
         "drawImage-from-element-orientation-none.tentative.html": [
-         "e18beb9e3cd78cd6bc575f06e5904cc8d21ee63e",
+         "d771ee66781f377795e52140a6877f5b599f8b1e",
          [
           null,
           [
@@ -228205,7 +228199,7 @@
          ]
         ],
         "drawImage-from-element-swap-width-height-orientation-none.tentative.html": [
-         "253c5361327bfbc4d3277527fc9a85dacc1cf708",
+         "ede43989cd02f0b6fd3a6b0820601aa715a8bdbe",
          [
           null,
           [
@@ -228218,7 +228212,7 @@
          ]
         ],
         "drawImage-from-element-swap-width-height.tentative.html": [
-         "fb59013645a304a44851eb9395e051234b8d29f6",
+         "6fe69bd4601e4733ed266dff5f7aa453b76e0f54",
          [
           null,
           [
@@ -228231,7 +228225,7 @@
          ]
         ],
         "drawImage-from-element.tentative.html": [
-         "7bad16cc31ccd91a0ad1e9687db46d5c4610f4a9",
+         "01c8bc575e948a082691b39e4a521967c1146acf",
          [
           null,
           [
@@ -241925,14 +241919,6 @@
     "ad4858c8745cfa1b330a52d27c621a09aa3112e0",
     []
    ],
-   "PeriodicBackgroundSync": {
-    "service_workers": {
-     "sw.js": [
-      "87351c1d2ffaf1702e1fbdf3a60a8c5a2cd8956d",
-      []
-     ]
-    }
-   },
    "README.md": [
     "b3782c2c33948d3287cc6f4fcf111cd50d29deea",
     []
@@ -244876,7 +244862,7 @@
         []
        ],
        "worker.js.template": [
-        "cb02ec66606b8784da97911ad752c08e334c4a8b",
+        "7a2a6e05c4417fe49b1f283f8cec36e7e809ba29",
         []
        ]
       },
@@ -244914,6 +244900,10 @@
        "42ebc0767bbea9d3d50f4a3f23c7863748e6908d",
        []
       ],
+      "referrer.py": [
+       "ad9e24847a108826db1e7124c7bff6f6f1a3fd5c",
+       []
+      ],
       "script.py": [
        "9d7cd0469f0ef9d2da9c322db4257cbdfbf310e8",
        []
@@ -298569,9 +298559,7 @@
       "webkit-line-clamp-035-ref.html": [
        "f7488ba2ec6ebeae2d281b29586aaedb9effab97",
        []
-      ]
-     },
-     "webkit-line-clamp": {
+      ],
       "webkit-line-clamp-with-line-height-ref.html": [
        "c2c8914161af668cd57ce7ebac15b2100d93be8b",
        []
@@ -321392,39 +321380,39 @@
        "image-orientation": {
         "reference": {
          "drawImage-from-bitmap-orientation-none-ref.html": [
-          "c3ce48f6b9245be8c913365e589100b72761a1eb",
+          "320a9b81082bcb7e547b2538bc624355c646ac11",
           []
          ],
          "drawImage-from-bitmap-ref.html": [
-          "712473b4ec72e70ba58449cbf3d22dffdd5a13bb",
+          "261d6a0b7c18bfef11ab80b9ce993f065edb4e5a",
           []
          ],
          "drawImage-from-bitmap-swap-width-height-orientation-none-ref.html": [
-          "48ddaf5ec08d9f25ee04ae02bb03e92b7b0b113a",
+          "3a78aad068701f5726b229a70cd53e9d15040dd6",
           []
          ],
          "drawImage-from-bitmap-swap-width-height-ref.html": [
-          "e945762eac716c5278eca8a0d1a6815a372f97b7",
+          "247d7f404931587acb1b5e9c7ebd374f778708bb",
           []
          ],
          "drawImage-from-blob-ref.html": [
-          "72bd98fa2528eb9c420311287491a27d3301934c",
+          "d1d3554c70a8a2fa30768f665fa7f2ca88f270e8",
           []
          ],
          "drawImage-from-element-orientation-none-ref.html": [
-          "b1e0c0849235cc13010f67ee26c58114c08c960a",
+          "b847b9eb731865942fa4e3cf997f9a57538dafbd",
           []
          ],
          "drawImage-from-element-ref.html": [
-          "5e49df799e1c084727f7bf3288e0c4d534c6b7b5",
+          "3f4d1e5ff42241e94513a3ecb6136ee4f34a7478",
           []
          ],
          "drawImage-from-element-swap-width-height-orientation-none-ref.html": [
-          "05ce03a3a54e116576df1c0f88b39d06979533f4",
+          "b26154b40a4556ad6bbe2ec60d7d7c9136a2e01e",
           []
          ],
          "drawImage-from-element-swap-width-height-ref.html": [
-          "8437a3df48eadbf7836136528e4d827d728d745a",
+          "21f0f88b881d748c8a22986caf2f78b770c80c76",
           []
          ]
         }
@@ -322551,6 +322539,10 @@
       "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
       []
      ],
+     "popup-with-structured-header.https.html.headers": [
+      "46ad58d83bf6e98913ca4c564b7acb8f19fa0093",
+      []
+     ],
      "resources": {
       "call-functionCalledByOpenee.html": [
        "d0ff0b723e0f31c6ed635db95851769a598ce2a1",
@@ -329926,10 +329918,6 @@
          "8599087be5e12554f1e6cee82c0cef883a1284df",
          []
         ],
-        "script-text-modifications.py": [
-         "20cbba2ee93b8bcff4f0d6b2828b22948a674d02",
-         []
-        ],
         "set-script-executed.js": [
          "a6095097dd7e17b1e5370b739b31d361f8fdaf7b",
          []
@@ -332339,7 +332327,7 @@
      []
     ],
     "webauthn.idl": [
-     "34a3df1ce1afbf925fa6166857429e5cd69660a5",
+     "73c96c87b91456199b5beb103ff89ae93b513738",
      []
     ],
     "webdriver.idl": [
@@ -334849,6 +334837,18 @@
      ]
     }
    },
+   "periodic-background-sync": {
+    "META.yml": [
+     "35224c093e594de9e4a5749088060e043362e541",
+     []
+    ],
+    "service_workers": {
+     "sw.js": [
+      "87351c1d2ffaf1702e1fbdf3a60a8c5a2cd8956d",
+      []
+     ]
+    }
+   },
    "permissions": {
     "META.yml": [
      "b055f50f636848ceb7b1750484cc12328a121398",
@@ -337384,7 +337384,7 @@
       []
      ],
      "webxr-test-math-helper.js": [
-      "d47fde208dac34a099c606b62f8ae2513ef7d247",
+      "14e163712670f1dd5f081d0189bfe719bbd08bd6",
       []
      ],
      "webxr-test-math-helper.js.headers": [
@@ -337392,7 +337392,7 @@
       []
      ],
      "webxr-test.js": [
-      "4401972c8b385cb51e58905d1594aaa4b44fa30e",
+      "7d4ad809bfd35163807eee542b4a765843f4805f",
       []
      ],
      "webxr-test.js.headers": [
@@ -342064,7 +342064,7 @@
       []
      ],
      "ci_wptrunner_infrastructure.sh": [
-      "992a1b58c24268baecdbbe03ee1e9f813fd460d9",
+      "f98385dd95d89a63eba12a4600b14dd2822816da",
       []
      ],
      "commands.json": [
@@ -351063,7 +351063,7 @@
      []
     ],
     "RTCPeerConnection-helper.js": [
-     "8a11a1ca1e9a00695d8103f79f7bd2eeabbf7956",
+     "25d126f9a9badddac4169cc5884a9e3a91b66082",
      []
     ],
     "RTCRtpCapabilities-helper.js": [
@@ -351116,7 +351116,7 @@
     },
     "simulcast": {
      "simulcast.js": [
-      "ed08ddca44866367bd66ea3b5a7c3a6f58a85f03",
+      "d8911f443e7521ed66be8f4e6079bb4318aada37",
       []
      ]
     },
@@ -353522,7 +353522,7 @@
       []
      ],
      "webxr_test_constants.js": [
-      "19ddbc24200de2039ce826507c4a6cea89979b05",
+      "3ae294c015a73fc193ce68c0f80aec4111c3302c",
       []
      ],
      "webxr_test_constants_fake_world.js": [
@@ -359949,59 +359949,6 @@
      ]
     ]
    },
-   "PeriodicBackgroundSync": {
-    "idlharness.https.any.js": [
-     "b0fc2a2d6c8e85fb7985683f88c25136aa2c3fdf",
-     [
-      "PeriodicBackgroundSync/idlharness.https.any.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ]
-       ]
-      }
-     ],
-     [
-      "PeriodicBackgroundSync/idlharness.https.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "periodicsync.https.window.js": [
-     "b68e4976a8f79f57c0813d6f10fcd5ea0718905b",
-     [
-      "PeriodicBackgroundSync/periodicsync.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/common/get-host-info.sub.js"
-        ],
-        [
-         "script",
-         "/service-workers/service-worker/resources/test-helpers.sub.js"
-        ]
-       ]
-      }
-     ]
-    ]
-   },
    "WebCryptoAPI": {
     "derive_bits_keys": {
      "ecdh_bits.https.any.js": [
@@ -445442,6 +445389,15 @@
         "timeout": "long"
        }
       ]
+     ],
+     "popup-with-structured-header.https.html": [
+      "a1b355f15b51cff3a622cce86854c45ddfd9108a",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
      ]
     },
     "dom": {
@@ -452978,7 +452934,7 @@
         ]
        ],
        "relevant-mutations.html": [
-        "db9a7eecc1141ef0a215c3aaadb280eb2d9acbe5",
+        "dc6e52f19df5aa74290f3ce8acbb7b48ce3ed337",
         [
          null,
          {
@@ -457902,7 +457858,7 @@
         ]
        ],
        "script-text-modifications.html": [
-        "0066d3f4260d92b0f541624062269d13fdbd763d",
+        "0ddec6a851fea76910dd97e7e8d42f8d907eef10",
         [
          null,
          {}
@@ -472452,6 +472408,59 @@
      ]
     ]
    },
+   "periodic-background-sync": {
+    "idlharness.https.any.js": [
+     "47c5e3fd04f7613e576f772e16fe73482c4fb9b3",
+     [
+      "periodic-background-sync/idlharness.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "periodic-background-sync/idlharness.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "periodicsync.https.window.js": [
+     "b68e4976a8f79f57c0813d6f10fcd5ea0718905b",
+     [
+      "periodic-background-sync/periodicsync.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/common/get-host-info.sub.js"
+        ],
+        [
+         "script",
+         "/service-workers/service-worker/resources/test-helpers.sub.js"
+        ]
+       ]
+      }
+     ]
+    ]
+   },
    "permissions": {
     "idlharness.any.js": [
      "ff0a969badace39c3c4466c4528e30c21355e132",
@@ -484350,6 +484359,13 @@
       ]
      ],
      "inheritance": {
+      "iframe-inheritance-about-blank.html": [
+       "2185ee29b9ac1ffded392c57defad54c13458987",
+       [
+        null,
+        {}
+       ]
+      ],
       "iframe-inheritance-data.html": [
        "1d39781e30583201cf057c5269146ea95ca2d510",
        [
@@ -510515,14 +510531,14 @@
     ],
     "simulcast": {
      "basic.https.html": [
-      "5387218432e3d6f506688b49140f8b30bf3982a8",
+      "f097ebb7f38fa24bebcb6a39905a45dc7335ce43",
       [
        null,
        {}
       ]
      ],
      "getStats.https.html": [
-      "9baa708124e0c7f9b0ff789428166d425dd55b6e",
+      "1161dfe2d47fd59e1e76c55d078bf7c1a9c1b96d",
       [
        null,
        {}
@@ -516111,7 +516127,7 @@
       ]
      ],
      "ar_dom_overlay_hit_test.https.html": [
-      "820dd7118a4d541a3a3db91e8d35e28c97764c71",
+      "6fdf2498edce0961acc96234fc07651fe072998c",
       [
        null,
        {}
@@ -516216,7 +516232,7 @@
      ]
     ],
     "getInputPose_pointer.https.html": [
-     "c8545999080892701858b425d8141ae0d3b3c469",
+     "9c2bf5217f81fc6f345a15e79170ec7aa6b2f750",
      [
       null,
       {}
@@ -516231,7 +516247,7 @@
     ],
     "hit-test": {
      "ar_hittest_subscription_inputSources.https.html": [
-      "b13d69a0d8442d63edd6657f4999b2b3c2a74c87",
+      "7b609d5e3a7b0990493af37f614086b552af7945",
       [
        null,
        {}
@@ -516259,7 +516275,7 @@
       ]
      ],
      "ar_hittest_subscription_transientInputSources.https.html": [
-      "fdfadc5bd89c45db4a506abf5c0013808ba37557",
+      "385bb667b318cb5d043bafc74aebb59be805b826",
       [
        null,
        {}
@@ -516514,14 +516530,14 @@
      ]
     ],
     "xrReferenceSpace_originOffset.https.html": [
-     "988d99728d4be41424a7c09d622a5a9b9b608a27",
+     "3d244b8ce29e2c74dd6f5c243dd2ab6679122c82",
      [
       null,
       {}
      ]
     ],
     "xrReferenceSpace_originOffsetBounded.https.html": [
-     "561c34ae942732eb6cb22875cf2f60b5b037a943",
+     "c50aff2515b85ab119c3c1c43487a98c5bf8dddb",
      [
       null,
       {}
@@ -543158,50 +543174,50 @@
        {}
       ]
      ],
-     "flex-direction-column-reverse.html": [
-      "824f3bd0c0ea696cd23a26856151997480bac10b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-direction-row-reverse.html": [
-      "6439aad70ca55c4a81ba8ab56ea0e2b5d467c03a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-direction-row.html": [
-      "8cbf395a4484a4246e78e302319333ca6a2358f4",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-direction_column-reverse.html": [
-      "2056001da635b05a273fc5f4a3ad6ae503ee24be",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-direction_column.html": [
+     "flex-direction-column-001-visual.html": [
       "f8b2d29e574f80d29c0a4b60d0d7b0117e7216f1",
       [
        null,
        {}
       ]
      ],
-     "flex-direction_row-reverse.html": [
+     "flex-direction-column-reverse-001-visual.html": [
+      "2056001da635b05a273fc5f4a3ad6ae503ee24be",
+      [
+       null,
+       {}
+      ]
+     ],
+     "flex-direction-column-reverse-002-visual.html": [
+      "824f3bd0c0ea696cd23a26856151997480bac10b",
+      [
+       null,
+       {}
+      ]
+     ],
+     "flex-direction-row-001-visual.html": [
+      "17c57a08a6315444fb9c8571585ee8e063bd1b7d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "flex-direction-row-002-visual.html": [
+      "8cbf395a4484a4246e78e302319333ca6a2358f4",
+      [
+       null,
+       {}
+      ]
+     ],
+     "flex-direction-row-reverse-001-visual.html": [
       "a1b9776f8e8c45d223c9bdf49db38a9b434bdbef",
       [
        null,
        {}
       ]
      ],
-     "flex-direction_row.html": [
-      "17c57a08a6315444fb9c8571585ee8e063bd1b7d",
+     "flex-direction-row-reverse-002-visual.html": [
+      "6439aad70ca55c4a81ba8ab56ea0e2b5d467c03a",
       [
        null,
        {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
new file mode 100644
index 00000000000..5e3f2d998e3
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-001.html]
+  [hit-test-floats-001]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 076c791cd3d..94a3570d26b 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,9 +8,6 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini
new file mode 100644
index 00000000000..3257d1b4d49
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html.ini
@@ -0,0 +1,2 @@
+[trailing-other-space-separators-break-spaces-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/css-transform-scale-001.html.ini b/tests/wpt/metadata/css/css-transforms/css-transform-scale-001.html.ini
deleted file mode 100644
index e31a1dfcc55..00000000000
--- a/tests/wpt/metadata/css/css-transforms/css-transform-scale-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-transform-scale-001.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
index c3e80f60581..a6c39d50087 100644
--- a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
@@ -8,6 +8,3 @@
   [throws if handleEvent is thruthy and not callable]
     expected: FAIL
 
-  [looks up handleEvent method on every event dispatch]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
index 3d6317220d3..668c3f52a5b 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -14,6 +14,3 @@
   [<li>Outside 3</li>]
     expected: FAIL
 
-  [<li>Image Inside 2</li>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    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 24d258c346b..0e5c70af39f 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,15 +312,18 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/html]
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 279734168dc..7d481211d8a 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -59,3 +59,6 @@
   [separate text/javascript;charset=windows-1252  text/javascript]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
new file mode 100644
index 00000000000..75d75b4cda2
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_2.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini
new file mode 100644
index 00000000000..6ae80ba13ca
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html.ini
@@ -0,0 +1,2 @@
+[drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini
new file mode 100644
index 00000000000..a74d6e4189c
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html.ini
@@ -0,0 +1,2 @@
+[drawImage-from-bitmap-swap-width-height.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini b/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini
new file mode 100644
index 00000000000..10bab447002
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html.ini
@@ -0,0 +1,2 @@
+[drawImage-from-element-swap-width-height.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/canvas/offscreen/convert-to-blob/offscreencanvas.convert.to.blob.html.ini b/tests/wpt/metadata/html/canvas/offscreen/convert-to-blob/offscreencanvas.convert.to.blob.html.ini
index 84e1a2d6fb2..4a35ddad23c 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/convert-to-blob/offscreencanvas.convert.to.blob.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/convert-to-blob/offscreencanvas.convert.to.blob.html.ini
@@ -17,3 +17,6 @@
   [Test that call convertToBlob on a detached OffscreenCanvas throws exception]
     expected: FAIL
 
+  [Test that call convertToBlob on a OffscreenCanvas with tainted origin throws exception]
+    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-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..963d4cd20ef 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index dc856a3d5a3..e440b1e38c6 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
index cef0aae4f81..b92c45b4d79 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
@@ -30,3 +30,39 @@
   [picture is inserted; img has src]
     expected: FAIL
 
+  [referrerpolicy no-referrer-when-downgrade to empty, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer-when-downgrade to no-referrer, src already set]
+    expected: FAIL
+
+  [referrerpolicy absent to no-referrer-when-downgrade, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer-when-downgrade to absent, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to invalid, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to no-referrer-when-downgrade, src already set]
+    expected: FAIL
+
+  [referrerpolicy empty to no-referrer-when-downgrade, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to empty, src already set]
+    expected: FAIL
+
+  [referrerpolicy absent to no-referrer, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer-when-downgrade to invalid, src already set]
+    expected: FAIL
+
+  [referrerpolicy no-referrer to absent, src already set]
+    expected: FAIL
+
+  [referrerpolicy empty to no-referrer, src already set]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 5bc8e9f3157..297595743a6 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,5 +12,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
new file mode 100644
index 00000000000..e677ad7aa84
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
@@ -0,0 +1,7 @@
+[iframe-inheritance-about-blank.html]
+  [The value of document.referrer in an about:blank iframe is the outer document's full URL, regardless of referrer policy]
+    expected: FAIL
+
+  [The fetch() API in an about:blank iframe with a custom URL referrer is fetched with a 'Referer` header that uses the outer document's URL along with its referrer policy]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 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,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 63dcc8480e6..37a773e5fec 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -188,3 +188,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 43995 more errors.\n\tMax AbsError of 1.9668388962745667e+0 at index of 472.\n\t[472\]\t9.9934011697769165e-1\t-9.6749877929687500e-1\t1.9668388962745667e+0\t2.0329109848634199e+0\t3.0517578125000000e-5\n\tMax RelError of 7.0894675876783291e+0 at index of 451.\n\t[451\]\t-8.5484469309449196e-3\t1.4038085937500000e-3\t9.9522555246949196e-3\t7.0894675876783291e+0\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44054 more errors.\n\tMax AbsError of 1.9961981773376465e+0 at index of 31768.\n\t[31768\]\t-9.9879217147827148e-1\t9.9740600585937500e-1\t1.9961981773376465e+0\t2.0013897706758867e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
index 1fdde19ecc9..b28bd566f16 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
@@ -1,5 +1,4 @@
 [audiocontextoptions.html]
-  expected: CRASH
   [X context = new AudioContext({sampleRate: 1}) did not throw an exception.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini b/tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini
deleted file mode 100644
index c7ab709ce6d..00000000000
--- a/tests/wpt/metadata/webxr/getInputPose_pointer.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[getInputPose_pointer.https.html]
-  [XRInputSources with a target ray mode of 'tracked-pointer' properly communicate their poses]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini b/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini
deleted file mode 100644
index 8ba221772e5..00000000000
--- a/tests/wpt/metadata/webxr/xrReferenceSpace_originOffset.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[xrReferenceSpace_originOffset.https.html]
-  [Updating XRReferenceSpace origin offset updates view and input matrices.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
index daa7a8c41bc..10dda3a6659 100644
--- a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
     expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/template/worker.js.template b/tests/wpt/web-platform-tests/common/security-features/scope/template/worker.js.template
index cb02ec66606..7a2a6e05c44 100644
--- a/tests/wpt/web-platform-tests/common/security-features/scope/template/worker.js.template
+++ b/tests/wpt/web-platform-tests/common/security-features/scope/template/worker.js.template
@@ -13,11 +13,6 @@ if ('DedicatedWorkerGlobalScope' in self &&
 
 // Receive a message from the parent and start the test.
 function onMessageFromParent(event, port) {
-  // Because this worker might receive messages from child context during
-  // tests, we first remove the listener here before staring the test
-  // (needed only for dedicated workers).
-  port.onmessage = undefined;
-
   const configurationError = "%(error)s";
   if (configurationError.length > 0) {
     port.postMessage({error: configurationError});
diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/referrer.py b/tests/wpt/web-platform-tests/common/security-features/subresource/referrer.py
new file mode 100644
index 00000000000..ad9e24847a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/common/security-features/subresource/referrer.py
@@ -0,0 +1,4 @@
+def main(request, response):
+    referrer = request.headers.get("referer", "")
+    response_headers = [("Content-Type", "text/javascript")];
+    return (200, response_headers, "window.referrer = '" + referrer + "'")
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-001.html b/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-001.html
index 1717f677f38..7bf4830fa1b 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-001.html
@@ -5,8 +5,6 @@
     <link rel="author" title="tmd" href="mailto:weisong4413@126.com">
     <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius">
     <link rel="match" href="reference/css-border-radius-ref-001.html">
-    <meta name="assert" content="">
-    <meta name="flag" content="border-radius">
     <style type="text/css">
 		.redSquare{
             position: absolute;
@@ -39,4 +37,4 @@
 		<div id="green" class="greenSquare"></div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-002.html b/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-002.html
index d13f4b28b4c..50adb24133a 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-002.html
@@ -6,7 +6,6 @@
     <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius">
     <link rel="match" href="reference/css-border-radius-ref-002.html">
     <meta name="assert" content="if there is more then one graph and one color">
-    <meta name="flag" content="border-radius">
     <style type="text/css">
         .redSquare {
             position: absolute;
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css-box-shadow-001.html b/tests/wpt/web-platform-tests/css/css-backgrounds/css-box-shadow-001.html
index 0bcedf4c37e..e6506e00f0e 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/css-box-shadow-001.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/css-box-shadow-001.html
@@ -6,8 +6,6 @@
     <link rel="help" href="http://www.w3.org/TR/css3-background/#the-box-shadow">
     <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius">
     <link rel="match" href="reference/css-box-shadow-ref-001.html">
-    <meta name="assert" content="">
-    <meta name="flag" content="box-shadow">
     <style type="text/css">
 		.greenSquare-shadow{
             position: absolute;
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_column.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-001-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_column.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-001-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_column-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-001-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_column-reverse.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-001-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-002-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-002-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_row.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-001-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_row.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-001-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-002-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-002-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_row-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-001-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction_row-reverse.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-001-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-002-visual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-002-visual.html
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp/webkit-line-clamp-with-line-height-ref.html b/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp/webkit-line-clamp-with-line-height-ref.html
rename to tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp/webkit-line-clamp-with-line-height.tentative.html b/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp/webkit-line-clamp-with-line-height.tentative.html
rename to tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html
index 94a62a5b3fa..a82635f986b 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp/webkit-line-clamp-with-line-height.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="match" href="webkit-line-clamp-with-line-height-ref.html">
+<link rel="match" href="reference/webkit-line-clamp-with-line-height-ref.html">
 <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/2847#issuecomment-468084957">
 <meta name="assert" content="This test checks that -webkit-line-clamp calculates respects line-height when calculating its block-size.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001.html b/tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001-manual.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001.html
rename to tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001-manual.html
index 7f5735ae58f..777951d4964 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001-manual.html
@@ -9,7 +9,6 @@
     <!-- See also: http://www.w3.org/wiki/CSS/Selectors/pseudo-classes/:hover -->
     <link rel="match" href="reference/css-transform-scale-ref-001.html">
     <meta name="assert" content="When the element is hovered over, the transform scales the element to twice its size in both the X and Y directions and moves its origin to the top left corner.">
-    <meta name="flag" content="interactive">
     <style type="text/css">
         .container {
             position: absolute;
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html
index f629caf27f0..46ce92e3e05 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html
@@ -8,7 +8,7 @@
 <link rel="match" href="reference/drawImage-from-bitmap-orientation-none-ref.html">
   <script>
     image = new Image();
-    image.src = "../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg";
+    image.src = "/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg";
 
     let imageLoadPromise = new Promise(resolve => {
       image.onload = resolve;
@@ -25,7 +25,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
   <canvas id="bitmap-canvas" style="image-orientation: none;"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html
index 2e88ae2e604..efa3d90dbc3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html
@@ -8,7 +8,7 @@
 <link rel="match" href="reference/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html">
   <script>
     image = new Image();
-    image.src = "../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg";
+    image.src = "/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg";
 
     let imageLoadPromise = new Promise(resolve => {
       image.onload = resolve;
@@ -26,7 +26,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
   <canvas id="bitmap-canvas" style="image-orientation: none;"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html
index bca00b38256..eabca5faef3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html
@@ -8,7 +8,7 @@
 <link rel="match" href="reference/drawImage-from-bitmap-swap-width-height-ref.html">
   <script>
     image = new Image();
-    image.src = "../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg";
+    image.src = "/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg";
 
     let imageLoadPromise = new Promise(resolve => {
       image.onload = resolve;
@@ -26,7 +26,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
   <canvas id="bitmap-canvas"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html
index 2014f9c5a2f..641d0ccca9e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html
@@ -8,7 +8,7 @@
 <link rel="match" href="reference/drawImage-from-bitmap-ref.html">
   <script>
     image = new Image();
-    image.src = "../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg";
+    image.src = "/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg";
 
     let imageLoadPromise = new Promise(resolve => {
       image.onload = resolve;
@@ -25,7 +25,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
   <canvas id="bitmap-canvas"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html
index e18beb9e3cd..d771ee66781 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html
@@ -18,7 +18,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
   <canvas id="bitmap-canvas" style="image-orientation: none;"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html
index 253c5361327..ede43989cd0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html
@@ -18,7 +18,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
   <canvas id="bitmap-canvas" style="image-orientation: none;"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html
index fb59013645a..6fe69bd4601 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html
@@ -18,7 +18,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
   <canvas id="bitmap-canvas"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html
index 7bad16cc31c..01c8bc575e9 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html
@@ -18,7 +18,7 @@
   </script>
 </head>
 <body>
-  <img id="img-element" src="../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
   <canvas id="bitmap-canvas"></canvas>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-orientation-none-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-orientation-none-ref.html
index c3ce48f6b92..320a9b81082 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-orientation-none-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-orientation-none-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
-  <img id="img-element" style="image-orientation: none;" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" style="image-orientation: none;" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-ref.html
index 712473b4ec7..261d6a0b7c1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html
index 48ddaf5ec08..3a78aad0687 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
-  <img id="img-element" style="image-orientation: none;" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" style="image-orientation: none;" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-ref.html
index e945762eac7..247d7f40493 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-bitmap-swap-width-height-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-blob-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-blob-ref.html
index 72bd98fa252..d1d3554c70a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-blob-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-blob-ref.html
@@ -5,6 +5,6 @@
 <title>createImageBitmap and drawImage from a blob with image orientation: from-image, reference</title>
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-orientation-none-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-orientation-none-ref.html
index b1e0c084923..b847b9eb731 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-orientation-none-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-orientation-none-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
-  <img id="img-element" style="image-orientation: none;" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" style="image-orientation: none;" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-ref.html
index 5e49df799e1..3f4d1e5ff42 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-orientation-none-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-orientation-none-ref.html
index 05ce03a3a54..b26154b40a4 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-orientation-none-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-orientation-none-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
-  <img id="img-element" style="image-orientation: none;" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" style="image-orientation: none;" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-ref.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-ref.html
index 8437a3df48e..21f0f88b881 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-ref.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/image-orientation/reference/drawImage-from-element-swap-width-height-ref.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
 </head>
 <body>
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
-  <img id="img-element" src="../../../../css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
+  <img id="img-element" src="/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg">
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html
new file mode 100644
index 00000000000..a1b355f15b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name=timeout content=long>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/common.js"></script>
+
+<div id=log></div>
+<script>
+
+let tests = [
+  // popup Origin, popup COOP, expect opener.
+  [SAME_ORIGIN, "unsafe-none; report-to=endpoint", false],
+  [SAME_ORIGIN, "same-origin; report-to=endpoint", true],
+  [SAME_ORIGIN, "same-origin-allow-popups; report-to=endpoint", false],
+];
+
+run_coop_tests("same-origin with structured headers", tests);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers
new file mode 100644
index 00000000000..46ad58d83bf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers
@@ -0,0 +1 @@
+Cross-Origin-Opener-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html
index db9a7eecc11..dc6e52f19df 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html
@@ -45,6 +45,32 @@
 <img src="/images/green-2x2.png" crossorigin=use-credentials data-desc="crossorigin use-credentials to anonymous, src already set">
 <img src="/images/green-2x2.png" crossorigin=use-credentials data-desc="crossorigin use-credentials to invalid, src already set">
 
+<img data-desc="referrerpolicy absent to no-referrer-when-downgrade, src absent">
+<img data-desc="referrerpolicy absent to no-referrer, src absent">
+<img referrerpolicy data-desc="referrerpolicy empty to no-referrer-when-downgrade, src absent">
+<img referrerpolicy data-desc="referrerpolicy empty to no-referrer, src absent">
+<img referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to absent, src absent">
+<img referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to empty, src absent">
+<img referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to no-referrer, src absent">
+<img referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to invalid, src absent">
+<img referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to absent, src absent">
+<img referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to empty, src absent">
+<img referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to no-referrer-when-downgrade, src absent">
+<img referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to invalid, src absent">
+
+<img src="/images/green-2x2.png" data-desc="referrerpolicy absent to no-referrer-when-downgrade, src already set">
+<img src="/images/green-2x2.png" data-desc="referrerpolicy absent to no-referrer, src already set">
+<img src="/images/green-2x2.png" referrerpolicy data-desc="referrerpolicy empty to no-referrer-when-downgrade, src already set">
+<img src="/images/green-2x2.png" referrerpolicy data-desc="referrerpolicy empty to no-referrer, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to absent, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to empty, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to no-referrer, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer-when-downgrade data-desc="referrerpolicy no-referrer-when-downgrade to invalid, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to absent, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to empty, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to no-referrer-when-downgrade, src already set">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer data-desc="referrerpolicy no-referrer to invalid, src already set">
+
 <img src="/images/green-2x2.png" data-desc="inserted into picture"><picture></picture>
 
 <picture><img src="/images/green-2x2.png" data-desc="removed from picture"></picture>
@@ -79,6 +105,13 @@
 <img src="/images/green-2x2.png" crossorigin=anonymous data-desc="crossorigin state not changed: anonymous to foobar">
 <img src="/images/green-2x2.png" crossorigin=use-credentials data-desc="crossorigin state not changed: use-credentials to USE-CREDENTIALS">
 
+<img src="/images/green-2x2.png" data-desc="referrerpolicy state not changed: absent, removeAttribute">
+<img src="/images/green-2x2.png" referrerpolicy data-desc="referrerpolicy state not changed: empty to empty">
+<img src="/images/green-2x2.png" referrerpolicy data-desc="referrerpolicy state not changed: empty to invalid">
+<img src="/images/green-2x2.png" data-desc="referrerpolicy state not changed: absent to invalid">
+<img src="/images/green-2x2.png" referrerpolicy=no-referrer data-desc="referrerpolicy state not changed: no-referrer to NO-REFERRER">
+<img src="/images/green-2x2.png" referrerpolicy=foobar data-desc="referrerpolicy state not changed: invalid to other-invalid">
+
 <img src="/images/green-2x2.png" data-desc="inserted into picture ancestor"><picture><span></span></picture>
 <picture><span><img src="/images/green-2x2.png" data-desc="removed from picture ancestor"></span></picture>
 
@@ -273,6 +306,109 @@ onload = function() {
     img.crossOrigin = 'foobar';
   }, 'load');
 
+  // When src is absent, changing the referrerpolicy attribute state MUST NOT
+  // generate events.
+
+  t('referrerpolicy absent to no-referrer-when-downgrade, src absent', function(img) {
+    img.referrerPolicy = 'no-referrer-when-downgrade';
+  }, 'timeout');
+
+  t('referrerpolicy absent to no-referrer, src absent', function(img) {
+    img.referrerPolicy = 'no-referrer';
+  }, 'timeout');
+
+  t('referrerpolicy empty to no-referrer-when-downgrade, src absent', function(img) {
+    img.referrerPolicy = 'no-referrer-when-downgrade';
+  }, 'timeout');
+
+  t('referrerpolicy empty to no-referrer, src absent', function(img) {
+    img.referrerPolicy = 'no-referrer';
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer-when-downgrade to absent, src absent', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer-when-downgrade to empty, src absent', function(img) {
+    img.referrerPolicy = '';
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer-when-downgrade to no-referrer, src absent', function(img) {
+    img.referrerPolicy = 'no-referrer';
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer-when-downgrade to invalid, src absent', function(img) {
+    img.referrerPolicy = 'foobar';
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer to absent, src absent', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer to empty, src absent', function(img) {
+    img.referrerPolicy = '';
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer to no-referrer-when-downgrade, src absent', function(img) {
+    img.referrerPolicy = 'no-referrer-when-downgrade';
+  }, 'timeout');
+
+  t('referrerpolicy no-referrer to invalid, src absent', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'timeout');
+
+  // When src is set, changing the referrerpolicy attribute state MUST generate
+  // events.
+
+  t('referrerpolicy absent to no-referrer-when-downgrade, src already set', function(img) {
+    img.referrerPolicy = 'no-referrer-when-downgrade';
+  }, 'load');
+
+  t('referrerpolicy absent to no-referrer, src already set', function(img) {
+    img.referrerPolicy = 'no-referrer';
+  }, 'load');
+
+  t('referrerpolicy empty to no-referrer-when-downgrade, src already set', function(img) {
+    img.referrerPolicy = 'no-referrer-when-downgrade';
+  }, 'load');
+
+  t('referrerpolicy empty to no-referrer, src already set', function(img) {
+    img.referrerPolicy = 'no-referrer';
+  }, 'load');
+
+  t('referrerpolicy no-referrer-when-downgrade to absent, src already set', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'load');
+
+  t('referrerpolicy no-referrer-when-downgrade to empty, src already set', function(img) {
+    img.referrerPolicy = '';
+  }, 'load');
+
+  t('referrerpolicy no-referrer-when-downgrade to no-referrer, src already set', function(img) {
+    img.referrerPolicy = 'no-referrer';
+  }, 'load');
+
+  t('referrerpolicy no-referrer-when-downgrade to invalid, src already set', function(img) {
+    img.referrerPolicy = 'foobar';
+  }, 'load');
+
+  t('referrerpolicy no-referrer to absent, src already set', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'load');
+
+  t('referrerpolicy no-referrer to empty, src already set', function(img) {
+    img.referrerPolicy = '';
+  }, 'load');
+
+  t('referrerpolicy no-referrer to no-referrer-when-downgrade, src already set', function(img) {
+    img.referrerPolicy = 'no-referrer-when-downgrade';
+  }, 'load');
+
+  t('referrerpolicy no-referrer to invalid, src already set', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'load');
+
+
   t('inserted into picture', function(img) {
     img.nextSibling.appendChild(img);
   }, 'load');
@@ -361,6 +497,30 @@ onload = function() {
     img.crossOrigin = 'USE-CREDENTIALS';
   }, 'timeout');
 
+  t('referrerpolicy state not changed: absent, removeAttribute', function(img) {
+    img.removeAttribute('referrerpolicy');
+  }, 'timeout');
+
+  t('referrerpolicy state not changed: empty to empty', function(img) {
+    img.referrerPolicy = '';
+  }, 'timeout');
+
+  t('referrerpolicy state not changed: empty to invalid', function(img) {
+    img.referrerPolicy = 'foobar';
+  }, 'timeout');
+
+  t('referrerpolicy state not changed: absent to invalid', function(img) {
+    img.referrerPolicy = 'foobar';
+  }, 'timeout');
+
+  t('referrerpolicy state not changed: no-referrer to NO-REFERRER', function(img) {
+    img.referrerPolicy = 'NO-REFERRER';
+  }, 'timeout');
+
+  t('referrerpolicy state not changed: invalid to other-invalid', function(img) {
+    img.referrerPolicy = 'foobar2';
+  }, 'timeout');
+
   t('inserted into picture ancestor', function(img) {
     img.nextSibling.firstChild.appendChild(img);
   }, 'timeout');
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/script-text-modifications.py b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/script-text-modifications.py
deleted file mode 100644
index 20cbba2ee93..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/script-text-modifications.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import time
-
-def main(request, response):
-    time.sleep(1.0);
-
-    return [("Content-type", "text/javascript")], """
-var s = document.getElementById('script0');
-s.innerText = 't.unreached_func("This should not be evaluated")();';
-"""
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html
index 0066d3f4260..0ddec6a851f 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html
@@ -9,16 +9,21 @@
 <script>
 var t = async_test("Modify inline script element's text " +
                    "after prepare-a-script before evaluation");
+
+function changeScriptText() {
+  document.querySelector('#script0').textContent =
+    't.unreached_func("This should not be evaluated")();';
+}
+
+t.step_timeout(changeScriptText, 500);
 </script>
 
 <!-- This is "a style sheet that is blocking scripts" and thus ... -->
-<link rel="stylesheet" href="/common/slow.py"></link>
-
-<script src="resources/script-text-modifications.py" async></script>
+<link rel="stylesheet" href="/common/slow.py?pipe=trickle(d1)"></link>
 
 <!-- This inline script becomes a parser-blocking script, and thus
-the async script above is evaluated after script0 is inserted into DOM,
-prepare-a-script'ed, and before its evaluation. -->
+the step_timeout is evaluated after script0 is inserted into DOM,
+prepare-a-script'ed, but before its evaluation. -->
 <script id="script0">
 t.step(() => {
     // When this is evaluated after the stylesheet is loaded,
diff --git a/tests/wpt/web-platform-tests/interfaces/webauthn.idl b/tests/wpt/web-platform-tests/interfaces/webauthn.idl
index 34a3df1ce1a..73c96c87b91 100644
--- a/tests/wpt/web-platform-tests/interfaces/webauthn.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webauthn.idl
@@ -55,7 +55,7 @@ dictionary PublicKeyCredentialCreationOptions {
     unsigned long                                timeout;
     sequence<PublicKeyCredentialDescriptor>      excludeCredentials = [];
     AuthenticatorSelectionCriteria               authenticatorSelection;
-    AttestationConveyancePreference              attestation = "none";
+    DOMString                                    attestation = "none";
     AuthenticationExtensionsClientInputs         extensions;
 };
 
@@ -93,7 +93,8 @@ enum ResidentKeyRequirement {
 enum AttestationConveyancePreference {
     "none",
     "indirect",
-    "direct"
+    "direct",
+    "enterprise"
 };
 
 dictionary PublicKeyCredentialRequestOptions {
diff --git a/tests/wpt/web-platform-tests/periodic-background-sync/META.yml b/tests/wpt/web-platform-tests/periodic-background-sync/META.yml
new file mode 100644
index 00000000000..35224c093e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/periodic-background-sync/META.yml
@@ -0,0 +1,4 @@
+spec: https://wicg.github.io/periodic-background-sync/
+suggested_reviewers:
+  - jakearchibald
+  - mugdhalakhani
diff --git a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js b/tests/wpt/web-platform-tests/periodic-background-sync/idlharness.https.any.js
similarity index 91%
rename from tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js
rename to tests/wpt/web-platform-tests/periodic-background-sync/idlharness.https.any.js
index b0fc2a2d6c8..47c5e3fd04f 100644
--- a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js
+++ b/tests/wpt/web-platform-tests/periodic-background-sync/idlharness.https.any.js
@@ -3,7 +3,7 @@
 
 'use strict';
 
-// https://github.com/WICG/BackgroundSync/blob/master/spec/PeriodicBackgroundSync-index.html
+// https://wicg.github.io/periodic-background-sync/
 
 const idl = `
 partial interface ServiceWorkerGlobalScope {
diff --git a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js b/tests/wpt/web-platform-tests/periodic-background-sync/periodicsync.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
rename to tests/wpt/web-platform-tests/periodic-background-sync/periodicsync.https.window.js
diff --git a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/service_workers/sw.js b/tests/wpt/web-platform-tests/periodic-background-sync/service_workers/sw.js
similarity index 100%
rename from tests/wpt/web-platform-tests/PeriodicBackgroundSync/service_workers/sw.js
rename to tests/wpt/web-platform-tests/periodic-background-sync/service_workers/sw.js
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html
new file mode 100644
index 00000000000..2185ee29b9a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html
@@ -0,0 +1,104 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Referrer Policy: iframe src="about:blank"</title>
+<link rel="author" title="Hiroshige Hayashizaki" href="mailto:hiroshige@chromium.org">
+<link rel="author" title="Dom Farolino" href="mailto:dom@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta name="referrer" content="origin">
+<body>
+<script>
+const testFetchClientReferrer =
+  async_test("The fetch() API in an about:blank iframe with the 'client' " +
+             "referrer is fetched with no 'Referer' header");
+const testFetchURLReferrer =
+  async_test("The fetch() API in an about:blank iframe with a custom URL " +
+             "referrer is fetched with a 'Referer` header that uses the " +
+             "outer document's URL along with its referrer policy");
+const testDocumentReferrer =
+  async_test("The value of document.referrer in an about:blank iframe is the " +
+             "outer document's full URL, regardless of referrer policy");
+const testSubresource =
+  async_test("A subresource fetched from an about:blank iframe is fetched " +
+             "with no 'Referer' header");
+
+window.addEventListener("message", msg => {
+  const test_name = msg.data.test;
+  const referrer = msg.data.referrer;
+  if (test_name === "testFetchClientReferrer") {
+    testFetchClientReferrer.step_func_done(() => {
+      // Because the URL of the Document of <iframe src="about:blank"> is
+      // "about:blank", the stripped URL is no referrer:
+      // https://w3c.github.io/webappsec-referrer-policy/#strip-url.
+      assert_equals(referrer, undefined);
+    })();
+  } else if (test_name === "testFetchURLReferrer") {
+    // <iframe src="about:blank"> inherits its parent's referrer policy.
+    // Note: Setting an explicit URL as referrer succeeds
+    // because the same-origin check at
+    // https://fetch.spec.whatwg.org/#dom-request
+    // is done against <iframe>'s origin, which inherits the parent
+    // Document's origin == location.orgin. Furthermore, since the iframe
+    // inherits its parent's referrer policy, the URL should be restricted to
+    // its origin.
+    testFetchURLReferrer.step_func_done(() => {
+      assert_equals(referrer, location.origin);
+    })();
+  } else if (test_name === "testDocumentReferrer") {
+    // The referrer of the initial document in an about:blank iframe is set to
+    // its creating document's URL, unredacted by a referrer policy, as per step
+    // 13 of:
+    // https://html.spec.whatwg.org/multipage/browsers.html#creating-a-new-browsing-context.
+    testDocumentReferrer.step_func_done(() => {
+      assert_equals(referrer, location.href);
+    })();
+  } else if (test_name === "testSubresource") {
+    // Because the URL of the Document of <iframe src="about:blank"> is
+    // "about:blank", the stripped URL is no referrer:
+    // https://w3c.github.io/webappsec-referrer-policy/#strip-url.
+    testSubresource.step_func_done(() => {
+      assert_equals(referrer, "");
+    })();
+  }
+});
+
+const iframe = document.createElement("iframe");
+document.body.appendChild(iframe);
+
+const iframe_script = iframe.contentDocument.createElement('script');
+iframe_script.textContent = `
+  // Test fetch() API with default "client" referrer.
+  fetch("${location.origin}/common/security-features/subresource/xhr.py?name=testFetchClientReferrer")
+    .then(r => r.json())
+    .then(j => {
+        top.postMessage({test: "testFetchClientReferrer", referrer: j.headers.referer}, "*")
+      }).catch(e => {
+        top.postMessage({test: "testFetchClientReferrer", referrer: "FAILURE"}, "*");
+      });
+
+  // Test fetch() API with custom URL referrer.
+  fetch("${location.origin}/common/security-features/subresource/xhr.py?name=URL",
+      {referrer: "${location.href}/custom"})
+    .then(r => r.json())
+    .then(j => {
+        top.postMessage({test: "testFetchURLReferrer", referrer: j.headers.referer}, "*")
+      }).catch(e => {
+        top.postMessage({test: "testFetchURLReferrer", referrer: "FAILURE"}, "*");
+      });
+
+  // Test document.referrer.
+  top.postMessage({test: "testDocumentReferrer", referrer: document.referrer}, "*");
+
+  // Test a subresource being fetched by the iframe.
+  const subresource_script = document.createElement('script');
+  subresource_script.src = "${location.origin}/common/security-features/subresource/referrer.py";
+  subresource_script.onload = e => {
+    top.postMessage({test: "testSubresource", referrer: window.referrer}, "*");
+  }
+  subresource_script.onerror = function(e) {
+    top.postMessage({test: "testSubresource", referrer: "FAILURE"}, "*");
+  };
+  document.head.appendChild(subresource_script);
+`;
+iframe.contentDocument.body.appendChild(iframe_script);
+</script>
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js
index d47fde208da..14e16371267 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js
@@ -238,6 +238,15 @@ class XRMathHelper {
 
     return result;
   }
+
+  static identity() {
+    return [
+      1, 0, 0, 0,
+      0, 1, 0, 0,
+      0, 0, 1, 0,
+      0, 0, 0, 1
+    ];
+  };
 }
 
 XRMathHelper.EPSILON = 0.001;
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index 4401972c8b3..7d4ad809bfd 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -825,7 +825,7 @@ class MockRuntime {
                                                         .filter(input_source => input_source.profiles_.includes(subscription.profileName));
 
       for (const input_source of matching_input_sources) {
-        const mojo_from_native_origin = this._getMojoFromInputSource(mojo_from_viewer, input_source);
+        const mojo_from_native_origin = input_source._getMojoFromInputSource(mojo_from_viewer);
 
         const [mojo_ray_origin, mojo_ray_direction] = this._transformRayToMojoSpace(
           subscription.ray,
@@ -1014,29 +1014,6 @@ class MockRuntime {
     }
   }
 
-  _getMojoFromInputSource(mojo_from_viewer, input_source) {
-    if (input_source.target_ray_mode_ === 'gaze') {  // XRTargetRayMode::GAZING
-      // If the pointer origin is gaze, then the result is
-      // just mojo_from_viewer.
-      return mojo_from_viewer;
-    } else if (input_source.target_ray_mode_ === 'tracked-pointer') {  // XRTargetRayMode:::POINTING
-      // If the pointer origin is tracked-pointer, the result is just
-      // mojo_from_input*input_from_pointer.
-      return XRMathHelper.mul4x4(
-        input_source.mojo_from_input_.matrix,
-        input_source.input_from_pointer_.matrix);
-    } else if (input_source.target_ray_mode_ === 'screen') { // XRTargetRayMode::TAPPING
-      // If the pointer origin is screen, the input_from_pointer is
-      // equivalent to viewer_from_pointer and the result is
-      // mojo_from_viewer*viewer_from_pointer.
-      return XRMathHelper.mul4x4(
-        mojo_from_viewer,
-        input_source.input_from_pointer_.matrix);
-    } else {
-      return null;
-    }
-  }
-
   _getMojoFromViewer() {
     const transform = {
       position: [
@@ -1054,15 +1031,6 @@ class MockRuntime {
   }
 
   _getMojoFromNativeOrigin(nativeOriginInformation) {
-    const identity = function() {
-      return [
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        0, 0, 0, 1
-      ];
-    };
-
     const mojo_from_viewer = this._getMojoFromViewer();
 
     if (nativeOriginInformation.$tag == device.mojom.XRNativeOriginInformation.Tags.inputSourceId) {
@@ -1070,12 +1038,12 @@ class MockRuntime {
         return null;
       } else {
         const inputSource = this.input_sources_.get(nativeOriginInformation.inputSourceId);
-        return this._getMojoFromInputSource(mojo_from_viewer, inputSource);
+        return inputSource._getMojoFromInputSource(mojo_from_viewer);
       }
     } else if (nativeOriginInformation.$tag == device.mojom.XRNativeOriginInformation.Tags.referenceSpaceCategory) {
       switch (nativeOriginInformation.referenceSpaceCategory) {
         case device.mojom.XRReferenceSpaceCategory.LOCAL:
-          return identity();
+          return XRMathHelper.identity();
         case device.mojom.XRReferenceSpaceCategory.LOCAL_FLOOR:
           if (this.stageParameters_ == null || this.stageParameters_.standingTransform == null) {
             console.warn("Standing transform not available.");
@@ -1166,9 +1134,14 @@ class MockXRInputSource {
 
   setGripOrigin(transform, emulatedPosition = false) {
     // grip_origin was renamed to mojo_from_input in mojo
-    this.mojo_from_input_ = new gfx.mojom.Transform();
-    this.mojo_from_input_.matrix = getMatrixFromTransform(transform);
+    this.mojo_from_input_ = composeGFXTransform(transform);
     this.emulated_position_ = emulatedPosition;
+
+    // Technically, setting the grip shouldn't make the description dirty, but
+    // the webxr-test-api sets our pointer as mojoFromPointer; however, we only
+    // support it across mojom as inputFromPointer, so we need to recalculate it
+    // whenever the grip moves.
+    this.desc_dirty_ = true;
   }
 
   clearGripOrigin() {
@@ -1176,14 +1149,14 @@ class MockXRInputSource {
     if (this.mojo_from_input_ != null) {
       this.mojo_from_input_ = null;
       this.emulated_position_ = false;
+      this.desc_dirty_ = true;
     }
   }
 
   setPointerOrigin(transform, emulatedPosition = false) {
-    // pointer_origin was renamed to input_from_pointer in mojo
+    // pointer_origin is mojo_from_pointer.
     this.desc_dirty_ = true;
-    this.input_from_pointer_ = new gfx.mojom.Transform();
-    this.input_from_pointer_.matrix = getMatrixFromTransform(transform);
+    this.mojo_from_pointer_ = composeGFXTransform(transform);
     this.emulated_position_ = emulatedPosition;
   }
 
@@ -1362,7 +1335,39 @@ class MockXRInputSource {
           break;
       }
 
-      input_desc.inputFromPointer = this.input_from_pointer_;
+      // Mojo requires us to send the pointerOrigin as relative to the grip
+      // space. If we don't have a grip space, we'll just assume that there
+      // is a grip at identity. This allows tests to simulate controllers that
+      // are really just a pointer with no tracked grip, though we will end up
+      // exposing that grip space.
+      let mojo_from_input = XRMathHelper.identity();
+      switch (this.target_ray_mode_) {
+        case 'gaze':
+        case 'screen':
+          // For gaze and screen space, we won't have a mojo_from_input; however
+          // the "input" position is just the viewer, so use mojo_from_viewer.
+          mojo_from_input = this.pairedDevice_._getMojoFromViewer();
+          break;
+        case 'tracked-pointer':
+          // If we have a tracked grip position (e.g. mojo_from_input), then use
+          // that. If we don't, then we'll just set the pointer offset directly,
+          // using identity as set above.
+          if (this.mojo_from_input_) {
+            mojo_from_input = this.mojo_from_input_.matrix;
+          }
+          break;
+        default:
+          throw new Error('Unhandled target ray mode ' + this.target_ray_mode_);
+      }
+
+      // To convert mojo_from_pointer to input_from_pointer, we need:
+      // input_from_pointer = input_from_mojo * mojo_from_pointer
+      // Since we store mojo_from_input, we need to invert it here before
+      // multiplying.
+      let input_from_mojo = XRMathHelper.inverse(mojo_from_input);
+      input_desc.inputFromPointer = new gfx.mojom.Transform();
+      input_desc.inputFromPointer.matrix =
+        XRMathHelper.mul4x4(input_from_mojo, this.mojo_from_pointer_.matrix);
 
       input_desc.profiles = this.profiles_;
 
@@ -1467,6 +1472,10 @@ class MockXRInputSource {
         return -1;
     }
   }
+
+  _getMojoFromInputSource(mojo_from_viewer) {
+    return this.mojo_from_pointer_.matrix;
+  }
 }
 
 // Mojo helper classes
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh b/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh
index 992a1b58c24..f98385dd95d 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh
@@ -6,13 +6,7 @@ WPT_ROOT=$SCRIPT_DIR/../..
 cd $WPT_ROOT
 
 test_infrastructure() {
-    local ARGS="";
-    if [ $PRODUCT == "firefox" ]; then
-        ARGS="--binary=~/build/firefox/firefox"
-    else
-        ARGS=$1
-    fi
-    TERM=dumb ./wpt run --log-mach - --yes --manifest ~/meta/MANIFEST.json --metadata infrastructure/metadata/ --install-fonts $ARGS $PRODUCT infrastructure/
+    TERM=dumb ./wpt run --log-mach - --yes --manifest ~/meta/MANIFEST.json --metadata infrastructure/metadata/ --install-fonts $1 $PRODUCT infrastructure/
 }
 
 main() {
@@ -22,7 +16,7 @@ main() {
         if [[ "$PRODUCT" == "chrome" ]]; then
             test_infrastructure "--binary=$(which google-chrome-unstable) --channel dev"
         else
-            test_infrastructure
+            test_infrastructure "--binary=~/build/firefox/firefox"
         fi
     done
 }
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
index 8a11a1ca1e9..25d126f9a9b 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
@@ -598,7 +598,6 @@ const trackFactories = {
       if (signal !== null) {
         ctx.fillStyle = `rgb(${signal}, ${signal}, ${signal})`;
         ctx.fillRect(10, 10, 20, 20);
-        let pixel = ctx.getImageData(15, 15, 1, 1);
       }
     }, 100);
 
diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/basic.https.html b/tests/wpt/web-platform-tests/webrtc/simulcast/basic.https.html
index 5387218432e..f097ebb7f38 100644
--- a/tests/wpt/web-platform-tests/webrtc/simulcast/basic.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/simulcast/basic.https.html
@@ -14,43 +14,6 @@ promise_test(async t => {
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
 
-  exchangeIceCandidates(pc1, pc2);
-
-  const metadataToBeLoaded = [];
-  pc2.ontrack = (e) => {
-    const stream = e.streams[0];
-    const v = document.createElement('video');
-    v.autoplay = true;
-    v.srcObject = stream;
-    v.id = stream.id
-    metadataToBeLoaded.push(new Promise((resolve) => {
-        v.addEventListener('loadedmetadata', () => {
-            resolve();
-        });
-    }));
-  };
-
-  // Use getUserMedia as getNoiseStream does not have enough entropy to ramp-up.
-  const stream = await navigator.mediaDevices.getUserMedia({video: {width: 1280, height: 720}});
-  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
-  pc1.addTransceiver(stream.getVideoTracks()[0], {
-    streams: [stream],
-    sendEncodings: rids.map(rid => {rid}),
-  });
-
-  const offer = await pc1.createOffer();
-  await pc1.setLocalDescription(offer),
-  await pc2.setRemoteDescription({
-    type: 'offer',
-    sdp: swapRidAndMidExtensionsInSimulcastOffer(offer, rids),
-  });
-  const answer = await pc2.createAnswer();
-  await pc2.setLocalDescription(answer);
-  await pc1.setRemoteDescription({
-    type: 'answer',
-    sdp: swapRidAndMidExtensionsInSimulcastAnswer(answer, pc1.localDescription, rids),
-  });
-  assert_equals(metadataToBeLoaded.length, 3);
-  return Promise.all(metadataToBeLoaded);
+  return negotiateSimulcastAndWaitForVideo(t, rids, pc1, pc2);
 }, 'Basic simulcast setup with three spatial layers');
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/getStats.https.html b/tests/wpt/web-platform-tests/webrtc/simulcast/getStats.https.html
index 9baa708124e..1161dfe2d47 100644
--- a/tests/wpt/web-platform-tests/webrtc/simulcast/getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/simulcast/getStats.https.html
@@ -14,44 +14,7 @@ promise_test(async t => {
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
 
-  exchangeIceCandidates(pc1, pc2);
-
-  const metadataToBeLoaded = [];
-  pc2.ontrack = (e) => {
-    const stream = e.streams[0];
-    const v = document.createElement('video');
-    v.autoplay = true;
-    v.srcObject = stream;
-    v.id = stream.id
-    metadataToBeLoaded.push(new Promise((resolve) => {
-        v.addEventListener('loadedmetadata', () => {
-            resolve();
-        });
-    }));
-  };
-
-  // Use getUserMedia as getNoiseStream does not have enough entropy to ramp-up.
-  const stream = await navigator.mediaDevices.getUserMedia({video: {width: 1280, height: 720}});
-  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
-  pc1.addTransceiver(stream.getVideoTracks()[0], {
-    streams: [stream],
-    sendEncodings: rids.map(rid => {rid}),
-  });
-
-  const offer = await pc1.createOffer();
-  await pc1.setLocalDescription(offer),
-  await pc2.setRemoteDescription({
-    type: 'offer',
-    sdp: swapRidAndMidExtensionsInSimulcastOffer(offer, rids),
-  });
-  const answer = await pc2.createAnswer();
-  await pc2.setLocalDescription(answer);
-  await pc1.setRemoteDescription({
-    type: 'answer',
-    sdp: swapRidAndMidExtensionsInSimulcastAnswer(answer, pc1.localDescription, rids),
-  });
-  assert_equals(metadataToBeLoaded.length, 3);
-  await Promise.all(metadataToBeLoaded);
+  await negotiateSimulcastAndWaitForVideo(t, rids, pc1, pc2);
 
   const outboundStats = [];
   const senderStats = await pc1.getSenders()[0].getStats();
@@ -62,4 +25,24 @@ promise_test(async t => {
   });
   assert_equals(outboundStats.length, 3);
 }, 'Simulcast getStats contains as many outbound-rtp reports as spatial layers');
+
+promise_test(async t => {
+  const rids = [0, 1, 2];
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  await negotiateSimulcastAndWaitForVideo(t, rids, pc1, pc2);
+
+  const outboundStats = [];
+  const senderStats = await pc1.getSenders()[0].getStats();
+  senderStats.forEach(stat => {
+    if (stat.type === 'outbound-rtp') {
+      outboundStats.push(stat);
+    }
+  });
+  const statsRids = outboundStats.map(stat => parseInt(stat.rid, 10));
+  assert_array_equals(rids, statsRids.sort());
+}, 'Simulcast getStats contains rid stats matching the rids provided');
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/simulcast.js b/tests/wpt/web-platform-tests/webrtc/simulcast/simulcast.js
index ed08ddca448..d8911f443e7 100644
--- a/tests/wpt/web-platform-tests/webrtc/simulcast/simulcast.js
+++ b/tests/wpt/web-platform-tests/webrtc/simulcast/simulcast.js
@@ -75,3 +75,44 @@ function swapRidAndMidExtensionsInSimulcastAnswer(answer, localDescription, rids
   });
   return sdp;
 }
+
+async function negotiateSimulcastAndWaitForVideo(t, rids, pc1, pc2) {
+  exchangeIceCandidates(pc1, pc2);
+
+  const metadataToBeLoaded = [];
+  pc2.ontrack = (e) => {
+    const stream = e.streams[0];
+    const v = document.createElement('video');
+    v.autoplay = true;
+    v.srcObject = stream;
+    v.id = stream.id
+    metadataToBeLoaded.push(new Promise((resolve) => {
+        v.addEventListener('loadedmetadata', () => {
+            resolve();
+        });
+    }));
+  };
+
+  // Use getUserMedia as getNoiseStream does not have enough entropy to ramp-up.
+  const stream = await navigator.mediaDevices.getUserMedia({video: {width: 1280, height: 720}});
+  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+  pc1.addTransceiver(stream.getVideoTracks()[0], {
+    streams: [stream],
+    sendEncodings: rids.map(rid => {rid}),
+  });
+
+  const offer = await pc1.createOffer();
+  await pc1.setLocalDescription(offer),
+  await pc2.setRemoteDescription({
+    type: 'offer',
+    sdp: swapRidAndMidExtensionsInSimulcastOffer(offer, rids),
+  });
+  const answer = await pc2.createAnswer();
+  await pc2.setLocalDescription(answer);
+  await pc1.setRemoteDescription({
+    type: 'answer',
+    sdp: swapRidAndMidExtensionsInSimulcastAnswer(answer, pc1.localDescription, rids),
+  });
+  assert_equals(metadataToBeLoaded.length, rids.length);
+  return Promise.all(metadataToBeLoaded);
+}
diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html b/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html
index 820dd7118a4..6fdf2498edc 100644
--- a/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html
+++ b/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html
@@ -51,7 +51,7 @@ const SCREEN_POINTER_TRANSFORM = {
 const screen_controller_init = {
     handedness: "none",
     targetRayMode: "screen",
-    pointerOrigin: SCREEN_POINTER_TRANSFORM,  // aka input_from_pointer
+    pointerOrigin: SCREEN_POINTER_TRANSFORM,  // aka mojo_from_pointer
     profiles: ["generic-touchscreen",]
 };
 
diff --git a/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html b/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html
index c8545999080..9c2bf5217f8 100644
--- a/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html
+++ b/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html
@@ -51,14 +51,15 @@ let testFunction =
         let input_pose = xrFrame.getPose(source.targetRaySpace, referenceSpace);
 
         t.step( () => {
-          // When a grip matrix is present but no pointer offset is specified,
-          // the grip and pointer matrices should be the same.
+          // When a grip matrix is set, both the grip and pointer matrices
+          // should yield their set values (i.e. the pointerOrigin is *not*
+          // transformed by the gripOrigin).
           assert_not_equals(grip_pose, null);
           assert_matrix_approx_equals(grip_pose.transform.matrix, VALID_GRIP,
             FLOAT_EPSILON, "Grip matrix is not equal to input.");
           assert_matrix_approx_equals(input_pose.transform.matrix,
-            grip_pose.transform.matrix, FLOAT_EPSILON,
-            "Grip matrix is not equal to target ray matrix.");
+            IDENTITY_MATRIX, FLOAT_EPSILON,
+            "Pointer matrix is not equal to its set value.");
         });
 
         input_source.setPointerOrigin(VALID_POINTER_TRANSFORM);
@@ -73,15 +74,13 @@ let testFunction =
         let input_pose = xrFrame.getPose(source.targetRaySpace, referenceSpace);
 
         t.step( () => {
-          // When a grip matrix and pointer offset are specified,
-          // pointer matrix should be grip matrix multiplied with the pointer
-          // offset.
+          // Verify that changes to the pointer origin are properly reflected.
           assert_not_equals(grip_pose, null);
           assert_matrix_approx_equals(grip_pose.transform.matrix, VALID_GRIP,
             FLOAT_EPSILON, "Grip matrix is not equal to input valid grip.");
           assert_matrix_approx_equals(input_pose.transform.matrix,
-            VALID_GRIP_WITH_POINTER_OFFSET, FLOAT_EPSILON,
-            "Grip matrix not multipled properly.");
+            VALID_POINTER, FLOAT_EPSILON,
+            "Pointer matrix not set properly.");
         });
 
         resolve();
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html
index b13d69a0d84..7b609d5e3a7 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html
@@ -21,15 +21,14 @@ const FLOOR_ORIGIN_TRANSFORM = {
   orientation: [0, 0, 0, 1],
 };
 
-const SCREEN_POINTER_TRANSFORM = {
-    position: [0, 0, 0],      // middle of the screen
-    orientation: [0, 0, 0, 1] // forward-facing
-};
+// Start the screen pointer at the same place as the viewer, so it's essentially
+// coming straight forward from the middle of the screen.
+const SCREEN_POINTER_TRANSFORM = VIEWER_ORIGIN_TRANSFORM;
 
 const screen_controller_init = {
     handedness: "none",
     targetRayMode: "screen",
-    pointerOrigin: SCREEN_POINTER_TRANSFORM,  // aka input_from_pointer
+    pointerOrigin: SCREEN_POINTER_TRANSFORM,  // aka mojo_from_pointer
     profiles: ["generic-touchscreen",]
 };
 
@@ -134,7 +133,7 @@ xr_session_promise_test("Ensures subscription to hit test works with an XRSpace
   'immersive-ar', { 'requiredFeatures': ['hit-test'] });
 
 const moved_pointer_transform_1 = {
-  position: [0, 0, 0],      // middle of the screen
+  position: [0, 1, 0],
   orientation: [ 0.707, 0, 0, 0.707 ] // 90 degrees around X axis = facing up
 };
 
@@ -158,7 +157,7 @@ const pose_2 = {
 };
 
 const moved_pointer_transform_2 = {
-  position: [0, 0, 0],      // middle of the screen
+  position: [0, 1, 0],
   orientation: [ 0, 0.2588, 0, 0.9659 ] // 30 degrees around Y axis = to the left,
                                         // creating 30-60-90 triangle with the front wall
 };
diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html
index fdfadc5bd89..385bb667b31 100644
--- a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html
+++ b/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html
@@ -21,15 +21,14 @@ const FLOOR_ORIGIN_TRANSFORM = {
   orientation: [0, 0, 0, 1],
 };
 
-const SCREEN_POINTER_TRANSFORM = {
-    position: [0, 0, 0],      // middle of the screen
-    orientation: [0, 0, 0, 1] // forward-facing
-};
+// Start the screen pointer at the same place as the viewer, so it's essentially
+// coming straight forward from the middle of the screen.
+const SCREEN_POINTER_TRANSFORM = VIEWER_ORIGIN_TRANSFORM;
 
 const screen_controller_init = {
     handedness: "none",
     targetRayMode: "screen",
-    pointerOrigin: SCREEN_POINTER_TRANSFORM,  // aka input_from_pointer
+    pointerOrigin: SCREEN_POINTER_TRANSFORM,  // aka mojo_from_pointer
     profiles: ["generic-touchscreen",]
 };
 
@@ -141,7 +140,7 @@ xr_session_promise_test("Ensures subscription to transient hit test works with a
   'immersive-ar', { 'requiredFeatures': ['hit-test'] });
 
 const moved_pointer_transform_1 = {
-  position: [0, 0, 0],      // middle of the screen
+  position: [0, 1, 0],
   orientation: [ 0.707, 0, 0, 0.707 ] // 90 degrees around X axis = facing up
 };
 
@@ -165,7 +164,7 @@ const pose_2 = {
 };
 
 const moved_pointer_transform_2 = {
-  position: [0, 0, 0],      // middle of the screen
+  position: [0, 1, 0],
   orientation: [ 0, 0.2588, 0, 0.9659 ] // 30 degrees around Y axis = to the left,
                                         // creating 30-60-90 triangle with the front wall
 };
diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js b/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js
index 19ddbc24200..3ae294c015a 100644
--- a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js
+++ b/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js
@@ -48,21 +48,16 @@ const VALID_GRIP_TRANSFORM = {
 };
 
 // A valid input pointer offset for  when we don't care about specific values
-const VALID_POINTER_OFFSET = [1, 0, 0, 0,
-                              0, 1, 0, 0,
-                              0, 0, 1, 0,
-                              0, 0, 1, 1];
+const VALID_POINTER = [1, 0, 0, 0,
+                       0, 1, 0, 0,
+                       0, 0, 1, 0,
+                       0, 0, 1, 1];
 
 const VALID_POINTER_TRANSFORM = {
     position: [0, 0, 1],
     orientation: [0, 0, 0, 1]
 };
 
-const VALID_GRIP_WITH_POINTER_OFFSET = [1, 0, 0, 0,
-                                        0, 1, 0, 0,
-                                        0, 0, 1, 0,
-                                        4, 3, 3, 1];
-
 // A Valid Local to floor matrix/transform for when we don't care about specific
 // values.  Note that these should be identical, just different representations.
 const VALID_FLOOR_ORIGIN_MATRIX = [1, 0,    0,  0,
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
index 988d99728d4..3d244b8ce29 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
@@ -42,8 +42,8 @@ let testFunction =
     };
 
     const POINTER_TRANSFORM_WITH_ROTATION = {
-      position: [2, 0, 1],
-      orientation: [0, 0, 0.7071, 0.7071]
+      position: [0, 1, 4],
+      orientation: [-0.5, 0.5, 0.5, -0.5]
     };
 
     let input_source = fakeDeviceController.simulateInputSourceConnection({
@@ -74,7 +74,7 @@ let testFunction =
       function OnFrame(time, frame) {
         let source = session.inputSources[0];
 
-        function CheckState(referenceSpace, expected_view_matrix, expected_grip_matrix, expected_ray_matrix) {
+        function CheckState(referenceSpace, expected_view_matrix, expected_grip_matrix, expected_ray_matrix, prefix) {
           t.step(() => {
             let pose = frame.getViewerPose(referenceSpace);
             let grip_pose = frame.getPose(source.gripSpace, referenceSpace);
@@ -84,13 +84,13 @@ let testFunction =
             let grip_matrix = grip_pose.transform.matrix;
             let ray_matrix = input_pose.transform.matrix;
 
-            assert_matrix_approx_equals(view_matrix, expected_view_matrix);
-            assert_matrix_approx_equals(grip_matrix, expected_grip_matrix);
-            assert_matrix_approx_equals(ray_matrix, expected_ray_matrix);
+            assert_matrix_approx_equals(view_matrix, expected_view_matrix, prefix + " view matrix");
+            assert_matrix_approx_equals(grip_matrix, expected_grip_matrix, prefix + " grip matrix");
+            assert_matrix_approx_equals(ray_matrix, expected_ray_matrix, prefix + " ray matrix");
           });
         }
 
-        CheckState(referenceSpace, EXPECTED_VIEW_MATRIX_1, EXPECTED_GRIP_MATRIX_1, EXPECTED_RAY_MATRIX_1);
+        CheckState(referenceSpace, EXPECTED_VIEW_MATRIX_1, EXPECTED_GRIP_MATRIX_1, EXPECTED_RAY_MATRIX_1, "Initial");
 
         const new_position1 = {
           x: 10,
@@ -105,7 +105,7 @@ let testFunction =
         };
 
         referenceSpace = referenceSpace.getOffsetReferenceSpace(new XRRigidTransform(new_position1, new_orientation1));
-        CheckState(referenceSpace, EXPECTED_VIEW_MATRIX_2, EXPECTED_GRIP_MATRIX_2, EXPECTED_RAY_MATRIX_2);
+        CheckState(referenceSpace, EXPECTED_VIEW_MATRIX_2, EXPECTED_GRIP_MATRIX_2, EXPECTED_RAY_MATRIX_2, "First transform");
 
         const new_position2 = {
           x: 5,
@@ -120,7 +120,7 @@ let testFunction =
         };
 
         referenceSpace = referenceSpace.getOffsetReferenceSpace(new XRRigidTransform(new_position2, new_orientation2));
-        CheckState(referenceSpace, EXPECTED_VIEW_MATRIX_3, EXPECTED_GRIP_MATRIX_3, EXPECTED_RAY_MATRIX_3);
+        CheckState(referenceSpace, EXPECTED_VIEW_MATRIX_3, EXPECTED_GRIP_MATRIX_3, EXPECTED_RAY_MATRIX_3, "Second transform");
 
         resolve();
       }
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
index 561c34ae942..c50aff2515b 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
@@ -54,7 +54,7 @@ function testFunction(session, fakeDeviceController, t) {
   };
 
   const LOCAL_POINTER_TRANSFORM = {
-    position: [0.01, 0.02, 0.03],
+    position: [1.01, 2.02, 3.03],
     orientation: [0, 0, 0, 1]
   }
 
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index 18445dc0730..9c4a3ba41db 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -71,3 +71,30 @@
   [WebGL test #44: attachment 7 should be 0,255,0,255\nat (4, 0) expected: 0,255,0,255 was 255,255,0,4]
     expected: FAIL
 
+  [WebGL test #52: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,255,0]
+    expected: FAIL
+
+  [WebGL test #44: attachment 7 should be 0,255,0,255\nat (4, 0) expected: 0,255,0,255 was 255,0,0,0]
+    expected: FAIL
+
+  [WebGL test #49: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,255,0]
+    expected: FAIL
+
+  [WebGL test #42: attachment 5 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,255,0]
+    expected: FAIL
+
+  [WebGL test #51: attachment 6 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,0]
+    expected: FAIL
+
+  [WebGL test #50: attachment 5 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,0,0]
+    expected: FAIL
+
+  [WebGL test #48: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,0,0]
+    expected: FAIL
+
+  [WebGL test #43: attachment 6 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,0]
+    expected: FAIL
+
+  [WebGL test #47: attachment 2 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,0,0,0]
+    expected: FAIL
+