diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html.ini
new file mode 100644
index 00000000000..759e5472c7e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html.ini
@@ -0,0 +1,2 @@
+[animation-fallback-missing-100-percent.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/animation-fallback-replace.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/animation-fallback-replace.html.ini
new file mode 100644
index 00000000000..9f20a3cf337
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/animation-fallback-replace.html.ini
@@ -0,0 +1,2 @@
+[animation-fallback-replace.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index c131078eace..23c61ede1a1 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,3 +17,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/dom/nodes/aria-element-reflection.tentative.html.ini b/tests/wpt/metadata-layout-2020/dom/nodes/aria-element-reflection.tentative.html.ini
new file mode 100644
index 00000000000..5184700fdaf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/dom/nodes/aria-element-reflection.tentative.html.ini
@@ -0,0 +1,67 @@
+[aria-element-reflection.tentative.html]
+  [Element reference set in invalid scope remains intact throughout move to valid scope.]
+    expected: FAIL
+
+  [Moving explicitly set elements around within the same scope, and removing from the DOM.]
+    expected: FAIL
+
+  [Deleting a reflected element should return null for the IDL attribute and cause the content attribute to become stale.]
+    expected: FAIL
+
+  [Reparenting an element into a descendant shadow scope hides the element reference.]
+    expected: FAIL
+
+  [aria-activedescendant element reflection]
+    expected: FAIL
+
+  [Reparenting referenced element cannot cause retargeting of reference.]
+    expected: FAIL
+
+  [aria-owns.]
+    expected: FAIL
+
+  [aria-details]
+    expected: FAIL
+
+  [shadow DOM behaviour for FrozenArray element reflection.]
+    expected: FAIL
+
+  [aria-flowto.]
+    expected: FAIL
+
+  [aria-labelledby.]
+    expected: FAIL
+
+  [aria-describedby.]
+    expected: FAIL
+
+  [Changing the ID of an element causes the content attribute to become out of sync.]
+    expected: FAIL
+
+  [aria-controls.]
+    expected: FAIL
+
+  [Setting the IDL attribute to an element which is not the first element in DOM order with its ID causes the content attribute to be an empty string]
+    expected: FAIL
+
+  [Attaching element reference before it's inserted into the DOM.]
+    expected: FAIL
+
+  [Reparenting.]
+    expected: FAIL
+
+  [aria-errormessage]
+    expected: FAIL
+
+  [Cross-document references and moves.]
+    expected: FAIL
+
+  [If the content attribute is set directly, the IDL attribute getter always returns the first element whose ID matches the content attribute.]
+    expected: FAIL
+
+  [Moving explicitly set elements across shadow DOM boundaries.]
+    expected: FAIL
+
+  [Setting an element reference that crosses into a shadow tree is disallowed, but setting one that is in a shadow inclusive ancestor is allowed.]
+    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 bc6c884d2c1..f19b9a10240 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,12 +315,15 @@
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" 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>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2b6af33d8..f29162631b3 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 3538891dae8..f45aaafe1c5 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 42ebcc9d57e..88f4ddd0e9a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.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-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 c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: 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-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..93673c2a0db 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-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..7d2b5231af2 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: 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/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index bb0734fc932..395fd310c84 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,69 +2,78 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionStart out of range a second time (must not fire select)]
+  [input type password: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
+  [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd out of range a second time (must not fire select)]
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html.ini
new file mode 100644
index 00000000000..81bbf4be9ac
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html.ini
@@ -0,0 +1,2 @@
+[popup-stacking.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    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 5602ea31dbe..450c88bd32b 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
@@ -4,5 +4,5 @@
     expected: TIMEOUT
 
   [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: TIMEOUT
+    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.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..5ddb9bfeff6 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,5 +16,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-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-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-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-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/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-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 706ccc0da69..4815ff4fb39 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -1172,6 +1172,15 @@
       ]
      ]
     },
+    "crashtests": {
+     "firefox-bug-1688293.html": [
+      "9ab1a88312683a66798cb52693c2ba4389222ff4",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "extensibility": {
      "foreignObject": {
       "foreign-object-circular-filter-reference-crash.html": [
@@ -121700,6 +121709,32 @@
     },
     "css-backgrounds": {
      "animations": {
+      "animation-fallback-missing-100-percent.html": [
+       "0f1ef1e87728e1d37b1975ee00198c876aee0c80",
+       [
+        null,
+        [
+         [
+          "/css/css-backgrounds/animations/animation-fallback-missing-100-percent-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "animation-fallback-replace.html": [
+       "61330686631374307c2cca3eaab19d25ae9dffcd",
+       [
+        null,
+        [
+         [
+          "/css/css-backgrounds/animations/animation-fallback-replace-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "one-element-animation.html": [
        "36696fcaf8b9fb5ea18efb030dc5c56c5c2eee01",
        [
@@ -148228,6 +148263,19 @@
        {}
       ]
      ],
+     "grid-flex-item-006.html": [
+      "b5d49c4824c794513c823a9c949789f565476cd0",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "image-items-flake-001.html": [
       "90319f1ad83d26d414d8ddcd4a9ab59042a4bd62",
       [
@@ -181157,6 +181205,19 @@
         {}
        ]
       ],
+      "percentage-resolution-005.html": [
+       "97842a26e19810347c7df622422d2b6a8639f176",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "replaced-element-001.html": [
        "bfc1b4b391e5eeea888681fbccdfd8d5ecbbe026",
        [
@@ -253511,6 +253572,47 @@
       {}
      ]
     ],
+    "focus": {
+     "focus-pseudo-on-shadow-host-1.html": [
+      "ba900d6a6d27b84b37de14f26ad2d8ed1a42adc9",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "focus-pseudo-on-shadow-host-2.html": [
+      "a605aca5a63a56d6d03aa743a5d8fee010fb6729",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "focus-pseudo-on-shadow-host-3.html": [
+      "e72d1b39d4c23fc9c6e43ab04aae6b525d957bbb",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    },
     "layout-slot-no-longer-assigned.html": [
      "dfcac99da023ec2bbd94835f71efaef952a62341",
      [
@@ -263324,6 +263426,12 @@
      "97ca870b6d5ad6908590176391142d4e8ce142d0",
      []
     ],
+    "third_party": {
+     "reftest-analyzer.xhtml": [
+      "4c7b26511acfa06b6801d36d4edc9943596aefcb",
+      []
+     ]
+    },
     "utils.js": [
      "62e742bee7f67cf3bd92a217a0a92b23fddf3017",
      []
@@ -301924,6 +302032,14 @@
       []
      ],
      "animations": {
+      "animation-fallback-missing-100-percent-ref.html": [
+       "7a0046f27b2bd432944e61aee3bb900300093019",
+       []
+      ],
+      "animation-fallback-replace-ref.html": [
+       "271281cf8842d48c5ff9c325a8189388936be45f",
+       []
+      ],
       "one-element-animation-ref.html": [
        "8e0e70ba20e56678753b78c91ba8d02fb195b6cf",
        []
@@ -319192,6 +319308,10 @@
        "1a2d02d5c71d7026c783e5215452ee7333308658",
        []
       ],
+      "history-restore-anchors-new-window.html": [
+       "bd8290e793dff28de516e84518a88498b35a307b",
+       []
+      ],
       "scrolling-vertical-rl.html": [
        "1273469dab2f53683669cc2103c0ede6e210bdc1",
        []
@@ -334487,6 +334607,26 @@
      []
     ],
     "experimental-features": {
+     "document-domain": {
+      "resources": {
+       "document-domain-disabled.html": [
+        "124ee143eee08b46b7effdb25e81cde65a1c16a8",
+        []
+       ],
+       "document-domain-disabled.html.headers": [
+        "57b46a600c0f4d5790767b74828a0ef56a34ba59",
+        []
+       ],
+       "document-domain-enabled.html": [
+        "fe03af0dbbe5dbb559b647a9fd2976b8035835b3",
+        []
+       ],
+       "document-domain-enabled.html.headers": [
+        "89ccbe756dfb39e50e8894eb791ee7626f18f59c",
+        []
+       ]
+      }
+     },
      "layout-animations-disabled-tentative.html.headers": [
       "745da550ee5162cffcdf3913a37efa6d355ca47e",
       []
@@ -342091,7 +342231,7 @@
        []
       ],
       "gentestutils.py": [
-       "b6861db5f9ef72bf5ed02087411e2c3694865d75",
+       "1ff2c77939695039601bb8d31e11d10b5962e3fe",
        []
       ],
       "name2dir-offscreen.yaml": [
@@ -342107,7 +342247,7 @@
        []
       ],
       "templates-offscreen.yaml": [
-       "58cec883c6a07443084905c939348a2221d587f6",
+       "b9d78567cc20afb8ff45826b307412d8a1190dfd",
        []
       ],
       "templates.yaml": [
@@ -342231,7 +342371,7 @@
          []
         ],
         "text.yaml": [
-         "b218d2d8b8b8bf253d9f471b1cb58aa8f21d3293",
+         "66a5b7cf9421933874202263de782726a48406f9",
          []
         ],
         "the-canvas-state.yaml": [
@@ -353257,7 +353397,7 @@
      []
     ],
     "xhr.idl": [
-     "d6d8193e1c36b71bd09c9cedf1b72fa4365d50c8",
+     "3abd09ce5ed7fa651466f7a242b573c3bc2d109f",
      []
     ],
     "xslt.tentative.idl": [
@@ -359459,7 +359599,7 @@
      []
     ],
     "testharness.js": [
-     "fea1f2f52e9f50c53e4689854927698eb57a30fb",
+     "11e31b133ddd20736119f216e0326f15dc82f691",
      []
     ],
     "testharness.js.headers": [
@@ -372042,7 +372182,7 @@
         []
        ],
        "executormarionette.py": [
-        "8301ba1073c3431f1fd919100c8fd115d57a247e",
+        "d61e1f262cd0bc7cde5792c5fd6a582e8e074b9a",
         []
        ],
        "executoropera.py": [
@@ -372066,7 +372206,7 @@
         []
        ],
        "executorwebdriver.py": [
-        "e6c5f9f1a206cb4f9f4d4fc3d2b72f5dd20e1fbc",
+        "0a968bf3f8c2833f2d621784b4f54a4c6875bde2",
         []
        ],
        "executorwebkit.py": [
@@ -372078,7 +372218,7 @@
         []
        ],
        "protocol.py": [
-        "e48add9334b68a07827be9f428b6ff81db86a7f4",
+        "05e251c78410600a7e81da65ce8572db698b0c15",
         []
        ],
        "pytestrunner": {
@@ -372125,7 +372265,7 @@
        []
       ],
       "font.py": [
-       "910358f51596f9e392f81ef156cdd0b101983b7b",
+       "97d74da4e4034193f87225483cfda797f81ae0bd",
        []
       ],
       "formatters": {
@@ -372323,7 +372463,7 @@
        []
       ],
       "wptcommandline.py": [
-       "60c74ef408e1839a2bcd733ac9ef4fda6dc0e72b",
+       "2b6d4b357c92995963485bad0a9bcac6d51f4b39",
        []
       ],
       "wptlogging.py": [
@@ -372891,15 +373031,15 @@
      []
     ],
     "trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers": [
-     "e4147bd2e372e4498f9a6ca138f9f29f4750561f",
+     "2bdd8a7d1abaa1200c50f9d58b8c8547dd589e84",
      []
     ],
     "trusted-types-eval-reporting-report-only.tentative.html.headers": [
-     "b5e94c400bb00aef7a9231c05500375f418c1065",
+     "d212eda5ef57093fb093634d664629f9633b8ee0",
      []
     ],
     "trusted-types-eval-reporting.tentative.html.headers": [
-     "3f55bba7d1b8d0965d3f9f29c7db301806f7c1a0",
+     "8989345e7220678381239e5553aa76232a1c2046",
      []
     ],
     "trusted-types-report-only.tentative.html.headers": [
@@ -372911,7 +373051,7 @@
      []
     ],
     "trusted-types-reporting.tentative.html.headers": [
-     "fa8aceab74b0f6e937da3999d471f6afaac4c24e",
+     "31c8e4131701cfa1cc794cea6b45d4c4915897fd",
      []
     ]
    },
@@ -396656,7 +396796,7 @@
      ]
     ],
     "async-navigator-clipboard-basics.https.html": [
-     "65759186a6c98ab25f35e18d4f9d9350caedb1a0",
+     "8fbcd11e7e963240f41e2e1ce6c9a0ae26979d3a",
      [
       null,
       {}
@@ -416428,7 +416568,7 @@
       ]
      ],
      "history-restore-anchors.html": [
-      "24dfcf72ec334627b2308821037f20ab5a700d68",
+      "ecd7806bc935459195862d0e331c4f6130c9efac",
       [
        null,
        {}
@@ -429680,7 +429820,7 @@
       ]
      ],
      "focus-visible-007.html": [
-      "3b7abf7646222134e80c5ecf3f518d0a5cf80abf",
+      "0fc196cbecdf1b198a5badce3694b1ec7cc95d4f",
       [
        null,
        {
@@ -429730,7 +429870,7 @@
       ]
      ],
      "focus-visible-013.html": [
-      "11cf4d7216a61bc833e4788975252c5829dfc884",
+      "a259a1cc73430e6fcee682e56e459dd6161dced6",
       [
        null,
        {
@@ -431393,6 +431533,15 @@
    },
    "document-policy": {
     "experimental-features": {
+     "document-domain": {
+      "document-domain.tentative.sub.html": [
+       "65de95c9a3899a884b9ccb47a626701799950bfa",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "document-write.tentative.html": [
       "551703c6f56b74856e2b7b465760fc57c2fe95dc",
       [
@@ -433854,7 +434003,7 @@
       ]
      ],
      "aria-element-reflection.tentative.html": [
-      "9073e52075a502943cf9dfb7586174e0533b63fa",
+      "fc20df6696e975d368b5e18cfad776c4284615fe",
       [
        null,
        {}
@@ -446273,7 +446422,7 @@
      ]
     ],
     "textdecoder-labels.any.js": [
-     "ed407a3254792398d5109d0d1ee5fbee5e9ef093",
+     "efc4ae2d2ea586cf15d2e89369c9bb337b765cfa",
      [
       "encoding/textdecoder-labels.any.html",
       {
@@ -446285,8 +446434,13 @@
         [
          "script",
          "resources/encodings.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ],
      [
@@ -446300,8 +446454,13 @@
         [
          "script",
          "resources/encodings.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ]
     ],
@@ -470295,10 +470454,18 @@
         ]
        ],
        "2d.composite.uncovered.fill.destination-in.worker.js": [
-        "ed191da99a747d57b3efcd2dffe67e3e51c72aa1",
+        "f4555f7d1dbbfe6ff203ef4cad5239b770e5ccb2",
         [
          "html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.composite.uncovered.fill.source-in.html": [
@@ -470595,10 +470762,18 @@
         ]
        ],
        "2d.drawImage.3arg.worker.js": [
-        "b89beed86fbc3a631544154e4c0cecb3dd382acb",
+        "219e90d36d8c18233745cbba7fc578aad71c9b9b",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.5arg.html": [
@@ -470611,10 +470786,18 @@
         ]
        ],
        "2d.drawImage.5arg.worker.js": [
-        "4d8b4bafd7fe0200478f85e39f2efb9981623e03",
+        "005235a24353e4354d5a9c5b2e331f56be318b61",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.9arg.basic.html": [
@@ -470627,10 +470810,18 @@
         ]
        ],
        "2d.drawImage.9arg.basic.worker.js": [
-        "9d6913aae9322ee110e3258bbe37b688dfd12e57",
+        "3f26c729ce8c584d57c9cdd1032ca1d54aa87ee2",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.9arg.destpos.html": [
@@ -470643,10 +470834,18 @@
         ]
        ],
        "2d.drawImage.9arg.destpos.worker.js": [
-        "b4a2402df76e90d06a984289f189885ecc3139d2",
+        "ed9a7256709f203afa47ee06ae572825e74d5ee3",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.9arg.destsize.html": [
@@ -470659,10 +470858,18 @@
         ]
        ],
        "2d.drawImage.9arg.destsize.worker.js": [
-        "5ad01d6715d645778e29e53adecc0899ea71a97c",
+        "8cc7748930489bbc83c3e2014e9b3b4f20ad4411",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.9arg.sourcepos.html": [
@@ -470675,10 +470882,18 @@
         ]
        ],
        "2d.drawImage.9arg.sourcepos.worker.js": [
-        "9679ee4cfac06ef88c818c22f480e5af62e20eec",
+        "6697bfeb8d783c1c2d288f9b433b43f373fa35d0",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.9arg.sourcesize.html": [
@@ -470691,10 +470906,18 @@
         ]
        ],
        "2d.drawImage.9arg.sourcesize.worker.js": [
-        "bfcafa951225c5416b17912cacab5a0bff489c91",
+        "7079998786c8249af7544cb29f593044d080c1c4",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.alpha.html": [
@@ -470707,10 +470930,18 @@
         ]
        ],
        "2d.drawImage.alpha.worker.js": [
-        "2621c5f8e12baa77a4c8eda79a938c21b525777c",
+        "791665c9daf9ab3259ccde5bd874105571fa88b5",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.animated.poster.html": [
@@ -470723,10 +470954,18 @@
         ]
        ],
        "2d.drawImage.animated.poster.worker.js": [
-        "4678ba3c5c2c96e41a200f63de34ab0a4351fc30",
+        "e92ffd652e94f934450f84fd4854654d59eba7f8",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.broken.html": [
@@ -470739,10 +470978,18 @@
         ]
        ],
        "2d.drawImage.broken.worker.js": [
-        "31e1241ab51af895c33d01d5e5937a2cbbd0216c",
+        "ab5f2d67d5c1d53d7a41dae542ef58708596a57b",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.canvas.html": [
@@ -470755,10 +471002,18 @@
         ]
        ],
        "2d.drawImage.canvas.worker.js": [
-        "09985f437e69b26ebfca9cfa16d8708ceedfb552",
+        "8ab99fe152f6a1404baa22e20754a62c8b38b4a9",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.clip.html": [
@@ -470771,10 +471026,18 @@
         ]
        ],
        "2d.drawImage.clip.worker.js": [
-        "886a84d1a4f95086a2cb794d007ecd6c86404b4d",
+        "39e6a924345680e98ede28499e06cd02051d74a1",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.composite.html": [
@@ -470787,10 +471050,18 @@
         ]
        ],
        "2d.drawImage.composite.worker.js": [
-        "ec2185b13d82a6a8784ee7346027cd1ea74db963",
+        "cf3b6c7129bb6207c1f3314af8194818d816edf9",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.floatsource.html": [
@@ -470803,10 +471074,18 @@
         ]
        ],
        "2d.drawImage.floatsource.worker.js": [
-        "95da2113bbe870c6fdd28e85530acc619a1539cb",
+        "28a74799136e6a23981681e00da8579de2e8d96d",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.negativedest.html": [
@@ -470819,10 +471098,18 @@
         ]
        ],
        "2d.drawImage.negativedest.worker.js": [
-        "29c64a3c13301bc35d22b91cf6d9e51106a9e952",
+        "95749c437598ca92625863eb99bbb1a4ad6c7132",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.negativedir.html": [
@@ -470835,10 +471122,18 @@
         ]
        ],
        "2d.drawImage.negativedir.worker.js": [
-        "a1a64c34a352372b09b1e71bb62898d36ed52044",
+        "23eb5a21bbd90a06cdca86fb4e5b5805dd09101b",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.negativesource.html": [
@@ -470851,10 +471146,18 @@
         ]
        ],
        "2d.drawImage.negativesource.worker.js": [
-        "19353c38c81683f46e2ec4e9a1021c8788c4f031",
+        "b27638554bd31d36429c105546483fee8b9acdaa",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.nonfinite.html": [
@@ -470867,10 +471170,18 @@
         ]
        ],
        "2d.drawImage.nonfinite.worker.js": [
-        "91ef15c8bc32e651ee112c8c7c65977945486124",
+        "0daa4c687e807e137e690e0c2cbb89c827185499",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.nowrap.html": [
@@ -470883,10 +471194,18 @@
         ]
        ],
        "2d.drawImage.nowrap.worker.js": [
-        "a4be66b950ec47c6d93b97c0b4aa299a5803a957",
+        "cd1bc0b8ba51c2a9235d785ca4b99ddba63219b4",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.null.html": [
@@ -470899,10 +471218,18 @@
         ]
        ],
        "2d.drawImage.null.worker.js": [
-        "5c9d774900672a8ab67acfa27315508850983c94",
+        "0572dd5addbd47827f8066d8e14207e6573ee705",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.path.html": [
@@ -470915,10 +471242,18 @@
         ]
        ],
        "2d.drawImage.path.worker.js": [
-        "497b837579b5e4b86a112af6e437132155d73cbe",
+        "1916238531a25575ef9c6761fa6a03f3ef1d48ad",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.self.1.html": [
@@ -470931,10 +471266,18 @@
         ]
        ],
        "2d.drawImage.self.1.worker.js": [
-        "fbcf171f606ff557ed3d5a5094cd0ebd54ba537c",
+        "17fcd2ad49d08dfa89b9a4c1820a8e76d1f9162f",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.self.2.html": [
@@ -470947,10 +471290,18 @@
         ]
        ],
        "2d.drawImage.self.2.worker.js": [
-        "524e91c8f0bb5a8b361b9e546bf8a4424201b919",
+        "adfeea5d93b464006453fb4058e8186464b6ec3f",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.svg.html": [
@@ -470963,10 +471314,18 @@
         ]
        ],
        "2d.drawImage.svg.worker.js": [
-        "6fc5e84345813d3f8bd6a1ac4969ace638a7fa1f",
+        "6189edc5c3855c71bd4113df989bf9578cd3f720",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.transform.html": [
@@ -470979,10 +471338,18 @@
         ]
        ],
        "2d.drawImage.transform.worker.js": [
-        "a8b8b9aa1f80f20e1cc8c5fb245fb35abfd421bb",
+        "791c710270263001b4b7391d73abaab007e5b232",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.wrongtype.html": [
@@ -470995,10 +471362,18 @@
         ]
        ],
        "2d.drawImage.wrongtype.worker.js": [
-        "418c9b2ebe310da20d5d8b099fec8d19b9b2fded",
+        "c3b945ca0e786b307839df340cb217b6e2e5cf6a",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.zerocanvas.html": [
@@ -471011,10 +471386,18 @@
         ]
        ],
        "2d.drawImage.zerocanvas.worker.js": [
-        "fb23cee4b4967b37cc3feedd0386ee6f74287ac7",
+        "7d6f9767dcb05eca94091bd77d1732361b51bb1a",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.zerosource.html": [
@@ -471036,17 +471419,33 @@
         ]
        ],
        "2d.drawImage.zerosource.image.worker.js": [
-        "200a311f7b24bbc517aba78925787a58b7e6a3cb",
+        "8901d7207d7a5d595afc67a220ef39a69818f3c5",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.drawImage.zerosource.worker.js": [
-        "37ef6d87352571d49d9c7d30f08c5e52b87dab16",
+        "7d5994edb3a24d96238c06c63707ae56e839e292",
         [
          "html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ]
       },
@@ -478762,17 +479161,27 @@
         ]
        ],
        "2d.text.draw.fill.maxWidth.zero.html": [
-        "a5c6645bbb3ed870d76a08350f4316dbc5854681",
+        "6174ddeb1e1562741eff5fa74372c4f5425626f8",
         [
          null,
-         {}
+         {
+          "timeout": "long"
+         }
         ]
        ],
        "2d.text.draw.fill.maxWidth.zero.worker.js": [
-        "4c326be75774ff375757f1c7397046b088baf0bd",
+        "eaeb45829e572157c4ac82f8626ffd1d11d02f80",
         [
          "html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.html",
-         {}
+         {
+          "script_metadata": [
+           [
+            "timeout",
+            "long"
+           ]
+          ],
+          "timeout": "long"
+         }
         ]
        ],
        "2d.text.draw.fill.unaffected.html": [
@@ -482387,7 +482796,7 @@
       ],
       "synthetic": {
        "001.html": [
-        "f90c345740df3f9c4366d01a3d47e323b30069fc",
+        "c0bf8a5776a53954d2e40945cc4ddf6577910236",
         [
          null,
          {}
@@ -491617,6 +492026,13 @@
          null,
          {}
         ]
+       ],
+       "popup-stacking.tentative.html": [
+        "bcba6f064c033aa25291fa7ff4df4ddb4f63d29d",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "the-summary-element": {
@@ -498156,13 +498572,6 @@
          {}
         ]
        ],
-       "pageshow-event.window.js": [
-        "45570b35abf2232476d9cb93f294ce68362e5646",
-        [
-         "html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.html",
-         {}
-        ]
-       ],
        "quirks.window.js": [
         "0ff0bb99443677b8f8844c8ecedef22c408f2bac",
         [
@@ -532633,6 +533042,13 @@
        }
       ]
      ],
+     "focus-pseudo-matches-on-shadow-host.html": [
+      "245e338a3b8f9226f8fd896692c1dfa45caa79ef",
+      [
+       null,
+       {}
+      ]
+     ],
      "focus-selector-delegatesFocus.html": [
       "3702f8e2ba63228cba5c483a76f2b77372e68c4d",
       [
@@ -542870,21 +543286,21 @@
      ]
     ],
     "trusted-types-eval-reporting-no-unsafe-eval.tentative.html": [
-     "081f9becbd09e7875ca3786842b9d2495df7e9ba",
+     "2b0922d212379cf7e7803fbe24cb3007884270c0",
      [
       null,
       {}
      ]
     ],
     "trusted-types-eval-reporting-report-only.tentative.html": [
-     "3fd1c9ffa8d115a939348a149121103d7b97c2ae",
+     "4e8ac5a2f43c97740269901fceb65db6b02752a5",
      [
       null,
       {}
      ]
     ],
     "trusted-types-eval-reporting.tentative.html": [
-     "9621aaba9749a9522703f87bfd23466545f14a70",
+     "73bb011349405bbee430cfcb9b0eb966b7faf8fa",
      [
       null,
       {}
@@ -542912,7 +543328,7 @@
      ]
     ],
     "trusted-types-reporting.tentative.html": [
-     "1e9d20d308f0027febaa96b0c9f952af7adb3555",
+     "9db307db60d963308ef970790da8e6cb70b02550",
      [
       null,
       {
@@ -545366,14 +545782,30 @@
      ]
     ],
     "url-constructor.any.js": [
-     "153d985ff6796183fd01b66437549544c497d02b",
+     "3f4af56d2a9654f323f912c5a6e64686c415da42",
      [
       "url/url-constructor.any.html",
-      {}
+      {
+       "script_metadata": [
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
      ],
      [
       "url/url-constructor.any.worker.html",
-      {}
+      {
+       "script_metadata": [
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
      ]
     ],
     "url-origin.any.js": [
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html.ini
new file mode 100644
index 00000000000..759e5472c7e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html.ini
@@ -0,0 +1,2 @@
+[animation-fallback-missing-100-percent.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/animation-fallback-replace.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/animation-fallback-replace.html.ini
new file mode 100644
index 00000000000..9f20a3cf337
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/animation-fallback-replace.html.ini
@@ -0,0 +1,2 @@
+[animation-fallback-replace.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/dom/nodes/aria-element-reflection.tentative.html.ini b/tests/wpt/metadata/dom/nodes/aria-element-reflection.tentative.html.ini
index aac403287a5..8fdfd11a475 100644
--- a/tests/wpt/metadata/dom/nodes/aria-element-reflection.tentative.html.ini
+++ b/tests/wpt/metadata/dom/nodes/aria-element-reflection.tentative.html.ini
@@ -50,3 +50,21 @@
   [Moving explicitly set elements across shadow DOM boundaries.]
     expected: FAIL
 
+  [Element reference set in invalid scope remains intact throughout move to valid scope.]
+    expected: FAIL
+
+  [Reparenting an element into a descendant shadow scope hides the element reference.]
+    expected: FAIL
+
+  [Reparenting referenced element cannot cause retargeting of reference.]
+    expected: FAIL
+
+  [Attaching element reference before it's inserted into the DOM.]
+    expected: FAIL
+
+  [Reparenting.]
+    expected: FAIL
+
+  [Cross-document references and moves.]
+    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 6567d6795f8..daf8630de14 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,12 +315,15 @@
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" 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>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    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
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index fd369192a02..c757b400205 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d1ca01ebc5f..6b68e9094e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index fc37df7e3fa..2a166bb97b7 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  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_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_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..cb0211f1d21 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/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 7a36937927c..7d2b5231af2 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,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index bb0734fc932..395fd310c84 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,69 +2,78 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionStart out of range a second time (must not fire select)]
+  [input type password: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
+  [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionEnd out of range a second time (must not fire select)]
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html.ini
new file mode 100644
index 00000000000..81bbf4be9ac
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html.ini
@@ -0,0 +1,2 @@
+[popup-stacking.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..fca4d908c89
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    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 edae5e5adcd..01f7b72cbe7 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
@@ -5,5 +5,5 @@
     expected: TIMEOUT
 
   [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..5ddb9bfeff6 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,5 +16,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-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/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-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/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/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/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html
index 65759186a6c..8fbcd11e7e9 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html
@@ -47,14 +47,23 @@ promise_test(async t => {
 }, 'navigator.clipboard.writeText() fails (expect DOMString)');
 
 promise_test(async () => {
-  const fetched = await fetch(
-        'http://localhost:8001/clipboard-apis/resources/greenbox.png');
+  const fetched = await fetch('/clipboard-apis/resources/greenbox.png');
   const image = await fetched.blob();
   const item = new ClipboardItem({'image/png': image});
 
   await navigator.clipboard.write([item]);
 }, 'navigator.clipboard.write({string : image/png Blob}) succeeds');
 
+promise_test(async() => {
+  const fetched = await fetch('/clipboard-apis/resources/greenbox.png');
+  const image = await fetched.blob();
+  const item = new ClipboardItem({
+    'text/plain': new Blob(['first'], {type: 'text/plain'}),
+    'image/png': image});
+
+  await navigator.clipboard.write([item]);
+}, 'navigator.clipboard.write([text + png] succeeds');
+
 promise_test(async () => {
   const result = await navigator.clipboard.read();
   assert_true(result instanceof Object);
diff --git a/tests/wpt/web-platform-tests/common/third_party/reftest-analyzer.xhtml b/tests/wpt/web-platform-tests/common/third_party/reftest-analyzer.xhtml
new file mode 100644
index 00000000000..4c7b26511ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/common/third_party/reftest-analyzer.xhtml
@@ -0,0 +1,934 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -*- Mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
+<!-- vim: set shiftwidth=2 tabstop=2 autoindent expandtab: -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!--
+
+Features to add:
+* make the left and right parts of the viewer independently scrollable
+* make the test list filterable
+** default to only showing unexpecteds
+* add other ways to highlight differences other than circling?
+* add zoom/pan to images
+* Add ability to load log via XMLHttpRequest (also triggered via URL param)
+* color the test list based on pass/fail and expected/unexpected/random/skip
+* ability to load multiple logs ?
+** rename them by clicking on the name and editing
+** turn the test list into a collapsing tree view
+** move log loading into popup from viewer UI
+
+-->
+<!DOCTYPE html>
+<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Reftest analyzer</title>
+  <style type="text/css"><![CDATA[
+
+  html, body { margin: 0; }
+  html { padding: 0; }
+  body { padding: 4px; }
+
+  #pixelarea, #itemlist, #images { position: absolute; }
+  #itemlist, #images { overflow: auto; }
+  #pixelarea { top: 0; left: 0; width: 320px; height: 84px; overflow: visible }
+  #itemlist { top: 84px; left: 0; width: 320px; bottom: 0; }
+  #images { top: 0; bottom: 0; left: 320px; right: 0; }
+
+  #leftpane { width: 320px; }
+  #images { position: fixed; top: 10px; left: 340px; }
+
+  form#imgcontrols { margin: 0; display: block; }
+
+  #itemlist > table { border-collapse: collapse; }
+  #itemlist > table > tbody > tr > td { border: 1px solid; padding: 1px; }
+  #itemlist td.activeitem { background-color: yellow; }
+
+  /*
+  #itemlist > table > tbody > tr.pass > td.url { background: lime; }
+  #itemlist > table > tbody > tr.fail > td.url { background: red; }
+  */
+
+  #magnification > svg { display: block; width: 84px; height: 84px; }
+
+  #pixelinfo { font: small sans-serif; position: absolute; width: 200px; left: 84px; }
+  #pixelinfo table { border-collapse: collapse; }
+  #pixelinfo table th { white-space: nowrap; text-align: left; padding: 0; }
+  #pixelinfo table td { font-family: monospace; padding: 0 0 0 0.25em; }
+
+  #pixelhint { display: inline; color: #88f; cursor: help; }
+  #pixelhint > * { display: none; position: absolute; margin: 8px 0 0 8px; padding: 4px; width: 400px; background: #ffa; color: black; box-shadow: 3px 3px 2px #888; z-index: 1; }
+  #pixelhint:hover { color: #000; }
+  #pixelhint:hover > * { display: block; }
+  #pixelhint p { margin: 0; }
+  #pixelhint p + p { margin-top: 1em; }
+
+  ]]></style>
+  <script type="text/javascript"><![CDATA[
+
+var XLINK_NS = "http://www.w3.org/1999/xlink";
+var SVG_NS = "http://www.w3.org/2000/svg";
+var IMAGE_NOT_AVAILABLE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAASCAYAAADczdVTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHy0lEQVRoge2aX2hb5xnGf2dYabROgqQkpMuKnWUJLmxHMFaa/SscteQiF5EvUgqLctEVrDJKK1+MolzkQr4IctgW+SLIheJc1BpFpswJw92FbaZsTCGTL0465AtntUekJdJ8lByVHbnnwLsLKbKdSJbiZBVjeuAYn+/P+z3fc97vfd9zbEVEhB566BK+1m0CPfx/o+eAPXQVbR3QqVapOl8FlR46h0O1Wu02iacCZfsasMKEz8vbx1JYE6fY/dXx6mEbFObPcvDVDBlznpc9G+2r8xNcvLqK2w39r4UI+fs7tFjmytgFFu718865EIebPGincI3zFz7Bcrtx97/GL0P+p+IPbSOgRwXtW3vpewqL/a/g5rgf39hit2m0hGUAHOHrrq3trmef4/lDB7Ay57n01zuPZXPX7jUunv+Yf9ktR7D/0CHca7/n3KXPsHbAuynkCWCZptgiImKLaVqP9NuW1bT9ceybpr3j+WJbYrVa3rbEatGZi2uixvWdrysilmWKae2M+5PqlktoosayLfubcrN10dAk24aynUsIxMVsadwUs+EX7dEyAlaXLqMoCj6fj5HkUqO9MD+Govjx+xXcXi+uoRAhvwuv182Z8Ws4AJUlxoZ8uNxuvF43ii/EtdXNNUuV68lR/IqC4gsxPj7KkE/BF5qmClRXrzFSt+/1ulDOjLNU6eQ4OcyPDqH4hhg5O4LicuN2K4xcvk6jjHUKJM8O1fvcKMoZkouFOq1VPp1OcuXGAvrvfsv0lWmSySTzN0sdH+jyYhK/ouB2e/G6XfjPJikBVG8SUhT8fl99nwVGfQp+vx+f4iO5VO1AtwJjfgXF58M/kqSVJP9ef0xuAI6NlwWmL41xxqeg+PyMXr72yBqW3cI4JaZHh1DcXrxeLy5liORiB7q1PiZFyeV0mQqz9TRZeUmFVUGLSjqdkgCIFp2RTCosEJOiiIihSyKWkDl9WYrFnCQCCNF0w0QmHhBQJTEzJ+nZSQmAoEYks2KIGBkJgASiM5I3LbGMnCSCCEQl38GJMvMZiag1e+nlFcmmIgKaZEwREaPGhWGZ1VfEMFZkNj4sgCSyhoihSzwSlqCGoAUlEo1IJByW+Oxyh+dZJJ+eklhiRnIrRcnrM6KCxLOmiNiipyICSGR2pTY2O1m7T2XEsNrrJmJLfjkn6amwoMbFaMEhG28eAVtzExErW3sOBCWVzkpmNiEqCOEZ2RyLTT3eJAKaMhVEUMOSXjHEtg3JTIUFkNTK9rGwbQrWm2xGb6QoWxIqEtdtEWO28aDtoi6JSFCAjUtL1AUzJA4SSW/IZ2VjjU0V0zEBJBiJSzwWk1g8IZEAAmrdidrBkoSKxB4IW08tGVNEzIxoIJM5a8v4SQ1RY5lGSy6x8xScz6QkHFBre1Zre49nH+y1KDEQLV7TcyU1LBCtHVppp9smxk2dYAMtHXA7blZWNJDZ4sZ4MxPbdHjrbc3WNuvOq4YlkYhLLBaXeKx2sLcrBUS2ScFtUbUBh3WgajvgOYgGuKjw4Rsqb1uvkssbWLbJXFQFqL/I9IEKa2WzYcqy16E2BNteB1R+cuwoRwcHGRx4nlfenWMuPclRDx3goSraqd+7Gj/Y5d76SrXLu3VKLYW1rMZbo/QpB4+9zt6fT1I0Law/LRMBaLzC7ePNuSgL7/2GpcotLr7+AZG5t9gH0Fa3zuFq1tiWG4DKs5tebV1NDDW1XYd26iWO9A8wODjAUfUN5ubm+Ch4ZFuuLRzQoVwqUCqXyN9fg3tFSuUShVIZhyr5O2vo94o42DwD/PP23fq8Bf5urLO+BoHBwxzc20c++wcmz+lAkWLFATwcf3+YDwIDhMYmuDw+wt5j5+C5ZwDYP/gSoLP6xX5+fOIkJ47/lIP8g49/Nc3tDj59OZUiRR3uFYsAVO/eZoE1yvkyeA6gAaff+zU3SxUcp8LilQucnoFTP3hhix19/garlQqFW9eZOBti9Mqt9mubXwBw+NALeDC4cfVDzgP3i3keUN/nf4uo+hEver/DRaK84/9mY/72uoFTKVMolVn5/HPgPvlSmVKhRL2bSrlEqVyidH8N/d7t2u/lakfcKneLgM4rvxhncbXA6tI8kTffB+0NjnrAqZYplcrk83ceXdtzgB+psHD7S/pfPs7JkydQB1x8dnWS2SVje9GaxkVLl+DmNNC4NJn/S6JxH5nJyNRwrW7Qi7oMgxBMyd9molvmRKO1cExgshG6l9NTEhkOynAkLlOJoKBuhPV8ZlK0h9aNTqVbv3ltEK/VIiAQEN0yZVLbuM+aImLoEgts3VdsJrfFil1M1/ZSv9RAROaWO8n/hkyF1Q3bgeFGygvPrDRG5Wcf1IJbq9rlNrrNbra96aqlUVMSWrNnNiw5uw23T/4o4Xq7FtA29h2My3K9WtETgRZr13UxdIk+pGswkpCcsX0N2OZD9BOgWqFsgWePp20KWb0ywkDgEIa8y55Gq0O5XKHP7cGz++l/haxWylgOuD17aG7eoVpxwL27RX8b27jZ42n1qdahXKrg2bfnUW0eQ7edoD232l+/LPp2pHvNfh8eT2f8/3sO2AZLyRAvns6gqToLOgxP6Uz87HvdoNJDF9E1B6ysLrLw5yW+3PUNvv3dH/L9wX3doNFDl9E1B+yhB+j9O1YPXcZ/AAl9BWJNvZE7AAAAAElFTkSuQmCC";
+
+var gPhases = null;
+
+var gIDCache = {};
+
+var gMagPixPaths = [];     // 2D array of array-of-two <path> objects used in the pixel magnifier
+var gMagWidth = 5;         // number of zoomed in pixels to show horizontally
+var gMagHeight = 5;        // number of zoomed in pixels to show vertically
+var gMagZoom = 16;         // size of the zoomed in pixels
+var gImage1Data;           // ImageData object for the reference image
+var gImage2Data;           // ImageData object for the test output image
+var gFlashingPixels = [];  // array of <path> objects that should be flashed due to pixel color mismatch
+var gParams;
+
+function ID(id) {
+  if (!(id in gIDCache))
+    gIDCache[id] = document.getElementById(id);
+  return gIDCache[id];
+}
+
+function hash_parameters() {
+  var result = { };
+  var params = window.location.hash.substr(1).split(/[&;]/);
+  for (var i = 0; i < params.length; i++) {
+    var parts = params[i].split("=");
+    result[parts[0]] = unescape(unescape(parts[1]));
+  }
+  return result;
+}
+
+function load() {
+  gPhases = [ ID("entry"), ID("loading"), ID("viewer") ];
+  build_mag();
+  gParams = hash_parameters();
+  if (gParams.log) {
+    show_phase("loading");
+    process_log(gParams.log);
+  } else if (gParams.logurl) {
+    show_phase("loading");
+    var req = new XMLHttpRequest();
+    req.onreadystatechange = function() {
+      if (req.readyState === 4) {
+        process_log(req.responseText);
+      }
+    };
+    req.open('GET', gParams.logurl, true);
+    req.send();
+  }
+  window.addEventListener('keypress', handle_keyboard_shortcut);
+  window.addEventListener('keydown',  handle_keydown);
+  ID("image1").addEventListener('error', image_load_error);
+  ID("image2").addEventListener('error', image_load_error);
+}
+
+function image_load_error(e) {
+  e.target.setAttributeNS(XLINK_NS, "xlink:href", IMAGE_NOT_AVAILABLE);
+}
+
+function build_mag() {
+  var mag = ID("mag");
+
+  var r = document.createElementNS(SVG_NS, "rect");
+  r.setAttribute("x", gMagZoom * -gMagWidth / 2);
+  r.setAttribute("y", gMagZoom * -gMagHeight / 2);
+  r.setAttribute("width", gMagZoom * gMagWidth);
+  r.setAttribute("height", gMagZoom * gMagHeight);
+  mag.appendChild(r);
+
+  mag.setAttribute("transform", "translate(" + (gMagZoom * (gMagWidth / 2) + 1) + "," + (gMagZoom * (gMagHeight / 2) + 1) + ")");
+
+  for (var x = 0; x < gMagWidth; x++) {
+    gMagPixPaths[x] = [];
+    for (var y = 0; y < gMagHeight; y++) {
+      var p1 = document.createElementNS(SVG_NS, "path");
+      p1.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "h" + -gMagZoom + "v" + gMagZoom);
+      p1.setAttribute("stroke", "black");
+      p1.setAttribute("stroke-width", "1px");
+      p1.setAttribute("fill", "#aaa");
+
+      var p2 = document.createElementNS(SVG_NS, "path");
+      p2.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "v" + gMagZoom + "h" + -gMagZoom);
+      p2.setAttribute("stroke", "black");
+      p2.setAttribute("stroke-width", "1px");
+      p2.setAttribute("fill", "#888");
+
+      mag.appendChild(p1);
+      mag.appendChild(p2);
+      gMagPixPaths[x][y] = [p1, p2];
+    }
+  }
+
+  var flashedOn = false;
+  setInterval(function() {
+    flashedOn = !flashedOn;
+    flash_pixels(flashedOn);
+  }, 500);
+}
+
+function show_phase(phaseid) {
+  for (var i in gPhases) {
+    var phase = gPhases[i];
+    phase.style.display = (phase.id == phaseid) ? "" : "none";
+  }
+
+  if (phase == "viewer")
+    ID("images").style.display = "none";
+}
+
+function fileentry_changed() {
+  show_phase("loading");
+  var input = ID("fileentry");
+  var files = input.files;
+  if (files.length > 0) {
+    // Only handle the first file; don't handle multiple selection.
+    // The parts of the log we care about are ASCII-only.  Since we
+    // can ignore lines we don't care about, best to read in as
+    // iso-8859-1, which guarantees we don't get decoding errors.
+    var fileReader = new FileReader();
+    fileReader.onload = function(e) {
+      var log = null;
+
+      log = e.target.result;
+
+      if (log)
+        process_log(log);
+      else
+        show_phase("entry");
+    }
+    fileReader.readAsText(files[0], "iso-8859-1");
+  }
+  // So the user can process the same filename again (after
+  // overwriting the log), clear the value on the form input so we
+  // will always get an onchange event.
+  input.value = "";
+}
+
+function log_pasted() {
+  show_phase("loading");
+  var entry = ID("logentry");
+  var log = entry.value;
+  entry.value = "";
+  process_log(log);
+}
+
+var gTestItems;
+
+// This function is not used in production code, but can be invoked manually
+// from the devtools console in order to test changes to the parsing regexes
+// in process_log.
+function test_parsing() {
+  // Note that the logs in these testcases have been manually edited to strip
+  // out stuff for brevity.
+  var testcases = [
+    { "name": "empty log",
+      "log": "",
+      "expected": { "pass": 0, "unexpected": 0, "random": 0, "skip": 0 },
+      "expected_images": 0,
+    },
+    { "name": "android log",
+      "log": `[task 2018-12-28T10:36:45.718Z] 10:36:45     INFO -  REFTEST TEST-START | a == b
+[task 2018-12-28T10:36:45.719Z] 10:36:45     INFO -  REFTEST TEST-LOAD | a | 78 / 275 (28%)
+[task 2018-12-28T10:36:56.138Z] 10:36:56     INFO -  REFTEST TEST-LOAD | b | 78 / 275 (28%)
+[task 2018-12-28T10:37:06.559Z] 10:37:06     INFO -  REFTEST TEST-UNEXPECTED-FAIL | a == b | image comparison, max difference: 255, number of differing pixels: 5950
+[task 2018-12-28T10:37:06.568Z] 10:37:06     INFO -  REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+[task 2018-12-28T10:37:06.577Z] 10:37:06     INFO -  REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+[task 2018-12-28T10:37:06.577Z] 10:37:06     INFO -  REFTEST INFO | Saved log: stuff trimmed here
+[task 2018-12-28T10:37:06.582Z] 10:37:06     INFO -  REFTEST TEST-END | a == b
+[task 2018-12-28T10:37:06.583Z] 10:37:06     INFO -  REFTEST TEST-START | a2 == b2
+[task 2018-12-28T10:37:06.583Z] 10:37:06     INFO -  REFTEST TEST-LOAD | a2 | 79 / 275 (28%)
+[task 2018-12-28T10:37:06.584Z] 10:37:06     INFO -  REFTEST TEST-LOAD | b2 | 79 / 275 (28%)
+[task 2018-12-28T10:37:16.982Z] 10:37:16     INFO -  REFTEST TEST-PASS | a2 == b2 | image comparison, max difference: 0, number of differing pixels: 0
+[task 2018-12-28T10:37:16.982Z] 10:37:16     INFO -  REFTEST TEST-END | a2 == b2`,
+      "expected": { "pass": 1, "unexpected": 1, "random": 0, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "local reftest run (Linux)",
+      "log": `REFTEST TEST-START | file:///a == file:///b
+REFTEST TEST-LOAD | file:///a | 73 / 86 (84%)
+REFTEST TEST-LOAD | file:///b | 73 / 86 (84%)
+REFTEST TEST-PASS | file:///a == file:///b | image comparison, max difference: 0, number of differing pixels: 0
+REFTEST TEST-END | file:///a == file:///b`,
+      "expected": { "pass": 1, "unexpected": 0, "random": 0, "skip": 0 },
+      "expected_images": 0,
+    },
+    { "name": "wpt reftests (Linux automation)",
+      "log": `16:50:43     INFO - TEST-START | /a
+16:50:43     INFO - PID 4276 | 1548694243694	Marionette	INFO	Testing http://web-platform.test:8000/a == http://web-platform.test:8000/b
+16:50:43     INFO - PID 4276 | 1548694243963	Marionette	INFO	No differences allowed
+16:50:44     INFO - TEST-PASS | /a | took 370ms
+16:50:44     INFO - TEST-START | /a2
+16:50:44     INFO - PID 4276 | 1548694244066	Marionette	INFO	Testing http://web-platform.test:8000/a2 == http://web-platform.test:8000/b2
+16:50:44     INFO - PID 4276 | 1548694244792	Marionette	INFO	No differences allowed
+16:50:44     INFO - PID 4276 | 1548694244792	Marionette	INFO	Found 28 pixels different, maximum difference per channel 14
+16:50:44     INFO - TEST-UNEXPECTED-FAIL | /a2 | Testing http://web-platform.test:8000/a2 == http://web-platform.test:8000/b2
+16:50:44     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+16:50:44     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+16:50:44     INFO - TEST-INFO took 840ms`,
+      "expected": { "pass": 1, "unexpected": 1, "random": 0, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "windows log",
+      "log": `12:17:14     INFO - REFTEST TEST-START | a == b
+12:17:14     INFO - REFTEST TEST-LOAD | a | 1603 / 2053 (78%)
+12:17:14     INFO - REFTEST TEST-LOAD | b | 1603 / 2053 (78%)
+12:17:14     INFO - REFTEST TEST-PASS(EXPECTED RANDOM) | a == b | image comparison, max difference: 0, number of differing pixels: 0
+12:17:14     INFO - REFTEST TEST-END | a == b
+12:17:14     INFO - REFTEST TEST-START | a2 == b2
+12:17:14     INFO - REFTEST TEST-LOAD | a2 | 1604 / 2053 (78%)
+12:17:14     INFO - REFTEST TEST-LOAD | b2 | 1604 / 2053 (78%)
+12:17:14     INFO - REFTEST TEST-UNEXPECTED-FAIL | a2 == b2 | image comparison, max difference: 255, number of differing pixels: 9976
+12:17:14     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+12:17:14     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+12:17:14     INFO - REFTEST INFO | Saved log: stuff trimmed here
+12:17:14     INFO - REFTEST TEST-END | a2 == b2
+12:01:09     INFO - REFTEST TEST-START | a3 == b3
+12:01:09     INFO - REFTEST TEST-LOAD | a3 | 66 / 189 (34%)
+12:01:09     INFO - REFTEST TEST-LOAD | b3 | 66 / 189 (34%)
+12:01:09     INFO - REFTEST TEST-KNOWN-FAIL | a3 == b3 | image comparison, max difference: 255, number of differing pixels: 9654
+12:01:09     INFO - REFTEST TEST-END | a3 == b3`,
+      "expected": { "pass": 1, "unexpected": 1, "random": 1, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "webrender wrench log (windows)",
+      "log": `[task 2018-12-29T04:29:48.800Z] REFTEST a == b
+[task 2018-12-29T04:29:48.984Z] REFTEST a2 == b2
+[task 2018-12-29T04:29:49.053Z] REFTEST TEST-UNEXPECTED-FAIL | a2 == b2 | image comparison, max difference: 255, number of differing pixels: 3128
+[task 2018-12-29T04:29:49.053Z] REFTEST   IMAGE 1 (TEST): data:image/png;
+[task 2018-12-29T04:29:49.053Z] REFTEST   IMAGE 2 (REFERENCE): data:image/png;
+[task 2018-12-29T04:29:49.053Z] REFTEST TEST-END | a2 == b2`,
+      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "wpt reftests (Linux local; Bug 1530008)",
+      "log": `SUITE-START | Running 1 tests
+TEST-START | /css/css-backgrounds/border-image-6.html
+TEST-UNEXPECTED-FAIL | /css/css-backgrounds/border-image-6.html | Testing http://web-platform.test:8000/css/css-backgrounds/border-image-6.html == http://web-platform.test:8000/css/css-backgrounds/border-image-6-ref.html
+REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+TEST-INFO took 425ms
+SUITE-END | took 2s`,
+      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "wpt reftests (taskcluster log from macOS CI)",
+      "log": `[task 2020-06-26T01:35:29.065Z] 01:35:29     INFO - TEST-START | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html
+[task 2020-06-26T01:35:29.065Z] 01:35:29     INFO - PID 1353 | 1593135329040    Marionette  INFO    Testing http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html == http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html
+[task 2020-06-26T01:35:29.673Z] 01:35:29     INFO - PID 1353 | 1593135329633    Marionette  INFO    No differences allowed
+[task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - TEST-KNOWN-INTERMITTENT-FAIL | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html | took 649ms
+[task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;
+[task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;`,
+      "expected": { "pass": 0, "unexpected": 0, "random": 1, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "wpt reftests (taskcluster log from Windows CI)",
+      "log": `[task 2020-06-26T01:41:19.205Z] 01:41:19     INFO - TEST-START | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html
+[task 2020-06-26T01:41:19.214Z] 01:41:19     INFO - PID 5920 | 1593135679202    Marionette  WARN    [24] http://web-platform.test:8000/css/WOFF2/metadatadisplay-schema-license-022-ref.xht overflows viewport (width: 783, height: 731)
+[task 2020-06-26T01:41:19.214Z] 01:41:19     INFO - PID 9692 | 1593135679208    Marionette  INFO    Testing http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html == http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html
+[task 2020-06-26T01:41:19.638Z] 01:41:19     INFO - PID 9692 | 1593135679627    Marionette  INFO    No differences allowed
+[task 2020-06-26T01:41:19.688Z] 01:41:19     INFO - TEST-KNOWN-INTERMITTENT-PASS | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html | took 474ms
+[task 2020-06-26T01:41:19.688Z] 01:41:19     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;
+[task 2020-06-26T01:41:19.689Z] 01:41:19     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;`,
+      "expected": { "pass": 1, "unexpected": 0, "random": 1, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "local reftest run with timestamps (Linux; Bug 1167712)",
+      "log": ` 0:05.21 REFTEST TEST-START | a
+ 0:05.21 REFTEST REFTEST TEST-LOAD | a | 0 / 1 (0%)
+ 0:05.27 REFTEST REFTEST TEST-LOAD | b | 0 / 1 (0%)
+ 0:05.66 REFTEST TEST-UNEXPECTED-FAIL | a | image comparison (==), max difference: 106, number of differing pixels: 800
+ 0:05.67 REFTEST REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+ 0:05.67 REFTEST REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+ 0:05.73 REFTEST REFTEST TEST-END | a`,
+      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+      "expected_images": 2,
+    },
+    { "name": "reftest run with whitespace compressed (Treeherder; Bug 1084322)",
+      "log": ` REFTEST TEST-START | a
+REFTEST TEST-LOAD | a | 0 / 1 (0%)
+REFTEST TEST-LOAD | b | 0 / 1 (0%)
+REFTEST TEST-UNEXPECTED-FAIL | a | image comparison (==), max difference: 106, number of differing pixels: 800
+REFTEST REFTEST IMAGE 1 (TEST): data:image/png;base64,
+REFTEST REFTEST IMAGE 2 (REFERENCE): data:image/png;base64,
+REFTEST REFTEST TEST-END | a`,
+      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+      "expected_images": 2,
+    },
+  ];
+
+  var current_test = 0;
+
+  // Override the build_viewer function invoked at the end of process_log to
+  // actually just check the results of parsing.
+  build_viewer = function() {
+    var expected = testcases[current_test].expected;
+    var expected_images = testcases[current_test].expected_images;
+    for (var result of gTestItems) {
+      for (let type in expected) { // type is "pass", "unexpected" etc.
+        if (result[type]) {
+          expected[type]--;
+        }
+      }
+    }
+    var failed = false;
+    for (let type in expected) {
+      if (expected[type] != 0) {
+        console.log(`Failure: for testcase ${testcases[current_test].name} got ${expected[type]} fewer ${type} results than expected!`);
+        failed = true;
+      }
+    }
+
+    let total_images = 0;
+    for (var result of gTestItems) {
+      total_images += result.images.length;
+    }
+    if (total_images !== expected_images) {
+      console.log(`Failure: for testcase ${testcases[current_test].name} got ${total_images} images, expected ${expected_images}`);
+      failed = true;
+    }
+
+    if (!failed) {
+      console.log(`Success for testcase ${testcases[current_test].name}`);
+    }
+  };
+
+  while (current_test < testcases.length) {
+    process_log(testcases[current_test].log);
+    current_test++;
+  }
+}
+
+function process_log(contents) {
+  var lines = contents.split(/[\r\n]+/);
+  gTestItems = [];
+  for (var j in lines) {
+
+    // !!!!!!
+    // When making any changes to this code, please add a test to the
+    // test_parsing function above, and ensure all existing tests pass.
+    // !!!!!!
+
+    var line = lines[j];
+    // Ignore duplicated output in logcat.
+    if (line.match(/I\/Gecko.*?REFTEST/))
+      continue;
+    var match = line.match(/^.*?(?:REFTEST\s+)+(.*)$/);
+    if (!match) {
+      // WPT reftests don't always have the "REFTEST" prefix but do have
+      // mozharness prefixing. Trying to match both prefixes optionally with a
+      // single regex either makes an unreadable mess or matches everything so
+      // we do them separately.
+      match = line.match(/^(?:.*? (?:INFO|ERROR) -\s+)(.*)$/);
+    }
+    if (match)
+      line = match[1];
+    match = line.match(/^(TEST-PASS|TEST-UNEXPECTED-PASS|TEST-FAIL|TEST-KNOWN-FAIL|TEST-UNEXPECTED-FAIL|TEST-DEBUG-INFO|TEST-KNOWN-INTERMITTENT-FAIL|TEST-KNOWN-INTERMITTENT-PASS)(\(EXPECTED RANDOM\)|) \| ([^\|]+)(?: \|(.*)|$)/);
+    if (match) {
+      var state = match[1];
+      var random = match[2];
+      var url = match[3];
+      var extra = match[4];
+      gTestItems.push(
+        {
+          pass: !state.match(/DEBUG-INFO$|FAIL$/),
+          // only one of the following three should ever be true
+          unexpected: !!state.match(/^TEST-UNEXPECTED/),
+          random: (random == "(EXPECTED RANDOM)" || state == "TEST-KNOWN-INTERMITTENT-FAIL" || state == "TEST-KNOWN-INTERMITTENT-PASS"),
+          skip: (extra == " (SKIP)"),
+          url: url,
+          images: [],
+          imageLabels: []
+        });
+      continue;
+    }
+    match = line.match(/^IMAGE([^:]*): (data:.*)$/);
+    if (match) {
+      var item = gTestItems[gTestItems.length - 1];
+      item.images.push(match[2]);
+      item.imageLabels.push(match[1]);
+    }
+  }
+
+  build_viewer();
+}
+
+function build_viewer() {
+  if (gTestItems.length == 0) {
+    show_phase("entry");
+    return;
+  }
+
+  var cell = ID("itemlist");
+  while (cell.childNodes.length > 0)
+    cell.removeChild(cell.childNodes[cell.childNodes.length - 1]);
+
+  var table = document.createElement("table");
+  var tbody = document.createElement("tbody");
+  table.appendChild(tbody);
+
+  for (var i in gTestItems) {
+    var item = gTestItems[i];
+
+    // optional url filter for only showing unexpected results
+    if (parseInt(gParams.only_show_unexpected) && !item.unexpected)
+      continue;
+
+    // XXX regardless skip expected pass items until we have filtering UI
+    if (item.pass && !item.unexpected)
+      continue;
+
+    var tr = document.createElement("tr");
+    var rowclass = item.pass ? "pass" : "fail";
+    var td;
+    var text;
+
+    td = document.createElement("td");
+    text = "";
+    if (item.unexpected) { text += "!"; rowclass += " unexpected"; }
+    if (item.random) { text += "R"; rowclass += " random"; }
+    if (item.skip) { text += "S"; rowclass += " skip"; }
+    td.appendChild(document.createTextNode(text));
+    tr.appendChild(td);
+
+    td = document.createElement("td");
+    td.id = "item" + i;
+    td.className = "url";
+    // Only display part of URL after "/mozilla/".
+    var match = item.url.match(/\/mozilla\/(.*)/);
+    text = document.createTextNode(match ? match[1] : item.url);
+    if (item.images.length > 0) {
+      var a = document.createElement("a");
+      a.href = "javascript:show_images(" + i + ")";
+      a.appendChild(text);
+      td.appendChild(a);
+    } else {
+      td.appendChild(text);
+    }
+    tr.appendChild(td);
+
+    tbody.appendChild(tr);
+  }
+
+  cell.appendChild(table);
+
+  show_phase("viewer");
+}
+
+function get_image_data(src, whenReady) {
+  var img = new Image();
+  img.onload = function() {
+    var canvas = document.createElement("canvas");
+    canvas.width = img.naturalWidth;
+    canvas.height = img.naturalHeight;
+
+    var ctx = canvas.getContext("2d");
+    ctx.drawImage(img, 0, 0);
+
+    whenReady(ctx.getImageData(0, 0, img.naturalWidth, img.naturalHeight));
+  };
+  img.src = src;
+}
+
+function sync_svg_size(imageData) {
+  // We need the size of the 'svg' and its 'image' elements to match the size
+  // of the ImageData objects that we're going to read pixels from or else our
+  // magnify() function will be very broken.
+  ID("svg").setAttribute("width", imageData.width);
+  ID("svg").setAttribute("height", imageData.height);
+}
+
+function show_images(i) {
+  var item = gTestItems[i];
+  var cell = ID("images");
+
+  // Remove activeitem class from any existing elements
+  var activeItems = document.querySelectorAll(".activeitem");
+  for (var activeItemIdx = activeItems.length; activeItemIdx-- != 0;) {
+    activeItems[activeItemIdx].classList.remove("activeitem");
+  }
+
+  ID("item" + i).classList.add("activeitem");
+  ID("image1").style.display = "";
+  ID("image2").style.display = "none";
+  ID("diffrect").style.display = "none";
+  ID("imgcontrols").reset();
+  ID("pixel-differences").textContent = "";
+
+  ID("image1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
+  // Making the href be #image1 doesn't seem to work
+  ID("feimage1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
+  if (item.images.length == 1) {
+    ID("imgcontrols").style.display = "none";
+  } else {
+    ID("imgcontrols").style.display = "";
+
+    ID("image2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
+    // Making the href be #image2 doesn't seem to work
+    ID("feimage2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
+
+    ID("label1").textContent = 'Image ' + item.imageLabels[0];
+    ID("label2").textContent = 'Image ' + item.imageLabels[1];
+  }
+
+  cell.style.display = "";
+
+  let loaded = [false, false];
+
+  function images_loaded(id) {
+    loaded[id] = true;
+    if (loaded.every(x => x)) {
+      update_pixel_difference_text()
+    }
+  }
+
+  get_image_data(item.images[0], function(data) { gImage1Data = data; sync_svg_size(gImage1Data); images_loaded(0)});
+  get_image_data(item.images[1], function(data) { gImage2Data = data; images_loaded(1)});
+
+}
+
+function update_pixel_difference_text() {
+  let differenceText;
+  if (gImage1Data.height !== gImage2Data.height ||
+      gImage1Data.width !== gImage2Data.width) {
+    differenceText = "Images are different sizes"
+  } else {
+    let [numPixels, maxPerChannel] = get_pixel_differences();
+    if (!numPixels) {
+      differenceText = "Images are identical";
+    } else {
+      differenceText = `Maximum difference per channel ${maxPerChannel}, ${numPixels} pixels differ`;
+    }
+  }
+  // Disable this for now, because per bug 1633504, the numbers may be
+  // inaccurate and dependent on the browser's configuration.
+  // ID("pixel-differences").textContent = differenceText;
+}
+
+function get_pixel_differences() {
+  let numPixels = 0;
+  let maxPerChannel = 0;
+  for (var i=0; i<gImage1Data.data.length; i+=4) {
+    let r1 = gImage1Data.data[i];
+    let r2 = gImage2Data.data[i];
+    let g1 = gImage1Data.data[i+1];
+    let g2 = gImage2Data.data[i+1];
+    let b1 = gImage1Data.data[i+2];
+    let b2 = gImage2Data.data[i+2];
+    // Ignore alpha.
+    if (r1 == r2 && g1 == g2 && b1 == b2) {
+      continue;
+    }
+    numPixels += 1;
+    let maxDiff = Math.max(Math.abs(r1-r2),
+                           Math.abs(g1-g2),
+                           Math.abs(b1-b2));
+    if (maxDiff > maxPerChannel) {
+      maxPerChannel = maxDiff
+    }
+  }
+  return [numPixels, maxPerChannel];
+}
+
+function show_image(i) {
+  if (i == 1) {
+    ID("image1").style.display = "";
+    ID("image2").style.display = "none";
+  } else {
+    ID("image1").style.display = "none";
+    ID("image2").style.display = "";
+  }
+}
+
+function handle_keyboard_shortcut(event) {
+  switch (event.charCode) {
+  case 49: // "1" key
+    document.getElementById("radio1").checked = true;
+    show_image(1);
+    break;
+  case 50: // "2" key
+    document.getElementById("radio2").checked = true;
+    show_image(2);
+    break;
+  case 100: // "d" key
+    document.getElementById("differences").click();
+    break;
+  case 112: // "p" key
+    shift_images(-1);
+    break;
+  case 110: // "n" key
+    shift_images(1);
+    break;
+  }
+}
+
+function handle_keydown(event) {
+  switch (event.keyCode) {
+  case 37:  // left arrow
+    move_pixel(-1, 0);
+    break;
+  case 38:  // up arrow
+    move_pixel(0,-1);
+    break;
+  case 39:  // right arrow
+    move_pixel(1, 0);
+    break;
+  case 40:  // down arrow
+    move_pixel(0, 1);
+    break;
+  }
+}
+
+function shift_images(dir) {
+  var activeItem = document.querySelector(".activeitem");
+  if (!activeItem) {
+    return;
+  }
+  for (var elm = activeItem; elm; elm = elm.parentElement) {
+    if (elm.tagName != "tr") {
+      continue;
+    }
+    elm = dir > 0 ? elm.nextElementSibling : elm.previousElementSibling;
+    if (elm) {
+      elm.getElementsByTagName("a")[0].click();
+    }
+    return;
+  }
+}
+
+function show_differences(cb) {
+  ID("diffrect").style.display = cb.checked ? "" : "none";
+}
+
+function flash_pixels(on) {
+  var stroke = on ? "red" : "black";
+  var strokeWidth = on ? "2px" : "1px";
+  for (var i = 0; i < gFlashingPixels.length; i++) {
+    gFlashingPixels[i].setAttribute("stroke", stroke);
+    gFlashingPixels[i].setAttribute("stroke-width", strokeWidth);
+  }
+}
+
+function cursor_point(evt) {
+  var m = evt.target.getScreenCTM().inverse();
+  var p = ID("svg").createSVGPoint();
+  p.x = evt.clientX;
+  p.y = evt.clientY;
+  p = p.matrixTransform(m);
+  return { x: Math.floor(p.x), y: Math.floor(p.y) };
+}
+
+function hex2(i) {
+  return (i < 16 ? "0" : "") + i.toString(16);
+}
+
+function canvas_pixel_as_hex(data, x, y) {
+  var offset = (y * data.width + x) * 4;
+  var r = data.data[offset];
+  var g = data.data[offset + 1];
+  var b = data.data[offset + 2];
+  return "#" + hex2(r) + hex2(g) + hex2(b);
+}
+
+function hex_as_rgb(hex) {
+  return "rgb(" + [parseInt(hex.substring(1, 3), 16), parseInt(hex.substring(3, 5), 16), parseInt(hex.substring(5, 7), 16)] + ")";
+}
+
+function magnify(evt) {
+  var { x: x, y: y } = cursor_point(evt);
+  do_magnify(x, y);
+}
+
+function do_magnify(x, y) {
+  var centerPixelColor1, centerPixelColor2;
+
+  var dx_lo = -Math.floor(gMagWidth / 2);
+  var dx_hi = Math.floor(gMagWidth / 2);
+  var dy_lo = -Math.floor(gMagHeight / 2);
+  var dy_hi = Math.floor(gMagHeight / 2);
+
+  flash_pixels(false);
+  gFlashingPixels = [];
+  for (var j = dy_lo; j <= dy_hi; j++) {
+    for (var i = dx_lo; i <= dx_hi; i++) {
+      var px = x + i;
+      var py = y + j;
+      var p1 = gMagPixPaths[i + dx_hi][j + dy_hi][0];
+      var p2 = gMagPixPaths[i + dx_hi][j + dy_hi][1];
+      // Here we just use the dimensions of gImage1Data since we expect test
+      // and reference to have the same dimensions.
+      if (px < 0 || py < 0 || px >= gImage1Data.width || py >= gImage1Data.height) {
+        p1.setAttribute("fill", "#aaa");
+        p2.setAttribute("fill", "#888");
+      } else {
+        var color1 = canvas_pixel_as_hex(gImage1Data, x + i, y + j);
+        var color2 = canvas_pixel_as_hex(gImage2Data, x + i, y + j);
+        p1.setAttribute("fill", color1);
+        p2.setAttribute("fill", color2);
+        if (color1 != color2) {
+          gFlashingPixels.push(p1, p2);
+          p1.parentNode.appendChild(p1);
+          p2.parentNode.appendChild(p2);
+        }
+        if (i == 0 && j == 0) {
+          centerPixelColor1 = color1;
+          centerPixelColor2 = color2;
+        }
+      }
+    }
+  }
+  flash_pixels(true);
+  show_pixelinfo(x, y, centerPixelColor1, hex_as_rgb(centerPixelColor1), centerPixelColor2, hex_as_rgb(centerPixelColor2));
+}
+
+function show_pixelinfo(x, y, pix1rgb, pix1hex, pix2rgb, pix2hex) {
+  var pixelinfo = ID("pixelinfo");
+  ID("coords").textContent = [x, y];
+  ID("pix1hex").textContent = pix1hex;
+  ID("pix1rgb").textContent = pix1rgb;
+  ID("pix2hex").textContent = pix2hex;
+  ID("pix2rgb").textContent = pix2rgb;
+}
+
+function move_pixel(deltax, deltay) {
+  coords = ID("coords").textContent.split(',');
+  x = parseInt(coords[0]);
+  y = parseInt(coords[1]);
+  if (isNaN(x) || isNaN(y)) {
+    return;
+  }
+  x = x + deltax;
+  y = y + deltay;
+  if (x >= 0 && y >= 0 && x < gImage1Data.width && y < gImage1Data.height) {
+    do_magnify(x, y);
+  }
+}
+
+  ]]></script>
+
+</head>
+<body onload="load()">
+
+<div id="entry">
+
+<h1>Reftest analyzer: load reftest log</h1>
+
+<p>Either paste your log into this textarea:<br />
+<textarea cols="80" rows="10" id="logentry"/><br/>
+<input type="button" value="Process pasted log" onclick="log_pasted()" /></p>
+
+<p>... or load it from a file:<br/>
+<input type="file" id="fileentry" onchange="fileentry_changed()" />
+</p>
+</div>
+
+<div id="loading" style="display:none">Loading log...</div>
+
+<div id="viewer" style="display:none">
+  <div id="pixelarea">
+    <div id="pixelinfo">
+      <table>
+        <tbody>
+          <tr><th>Pixel at:</th><td colspan="2" id="coords"/></tr>
+          <tr><th>Image 1:</th><td id="pix1rgb"></td><td id="pix1hex"></td></tr>
+          <tr><th>Image 2:</th><td id="pix2rgb"></td><td id="pix2hex"></td></tr>
+        </tbody>
+      </table>
+      <div>
+        <div id="pixelhint">★
+          <div>
+            <p>Move the mouse over the reftest image on the right to show
+            magnified pixels on the left.  The color information above is for
+            the pixel centered in the magnified view.</p>
+            <p>Image 1 is shown in the upper triangle of each pixel and Image 2
+            is shown in the lower triangle.</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div id="magnification">
+      <svg xmlns="http://www.w3.org/2000/svg" width="84" height="84" shape-rendering="optimizeSpeed">
+        <g id="mag"/>
+      </svg>
+    </div>
+  </div>
+  <div id="itemlist"></div>
+  <div id="images" style="display:none">
+    <form id="imgcontrols">
+    <input id="radio1" type="radio" name="which" value="0" onchange="show_image(1)" checked="checked" /><label id="label1" title="1" for="radio1">Image 1</label>
+    <input id="radio2" type="radio" name="which" value="1" onchange="show_image(2)"                   /><label id="label2" title="2" for="radio2">Image 2</label>
+    <label><input id="differences" type="checkbox" onchange="show_differences(this)" />Circle differences</label>
+    </form>
+    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="1000" id="svg">
+      <defs>
+        <!-- use sRGB to avoid loss of data -->
+        <filter id="showDifferences" x="0%" y="0%" width="100%" height="100%"
+                style="color-interpolation-filters: sRGB">
+          <feImage id="feimage1" result="img1" xlink:href="#image1" />
+          <feImage id="feimage2" result="img2" xlink:href="#image2" />
+          <!-- inv1 and inv2 are the images with RGB inverted -->
+          <feComponentTransfer result="inv1" in="img1">
+            <feFuncR type="linear" slope="-1" intercept="1" />
+            <feFuncG type="linear" slope="-1" intercept="1" />
+            <feFuncB type="linear" slope="-1" intercept="1" />
+          </feComponentTransfer>
+          <feComponentTransfer result="inv2" in="img2">
+            <feFuncR type="linear" slope="-1" intercept="1" />
+            <feFuncG type="linear" slope="-1" intercept="1" />
+            <feFuncB type="linear" slope="-1" intercept="1" />
+          </feComponentTransfer>
+          <!-- w1 will have non-white pixels anywhere that img2
+               is brighter than img1, and w2 for the reverse.
+               It would be nice not to have to go through these
+               intermediate states, but feComposite
+               type="arithmetic" can't transform the RGB channels
+               and leave the alpha channel untouched. -->
+          <feComposite result="w1" in="img1" in2="inv2" operator="arithmetic" k2="1" k3="1" />
+          <feComposite result="w2" in="img2" in2="inv1" operator="arithmetic" k2="1" k3="1" />
+          <!-- c1 will have non-black pixels anywhere that img2
+               is brighter than img1, and c2 for the reverse -->
+          <feComponentTransfer result="c1" in="w1">
+            <feFuncR type="linear" slope="-1" intercept="1" />
+            <feFuncG type="linear" slope="-1" intercept="1" />
+            <feFuncB type="linear" slope="-1" intercept="1" />
+          </feComponentTransfer>
+          <feComponentTransfer result="c2" in="w2">
+            <feFuncR type="linear" slope="-1" intercept="1" />
+            <feFuncG type="linear" slope="-1" intercept="1" />
+            <feFuncB type="linear" slope="-1" intercept="1" />
+          </feComponentTransfer>
+          <!-- c will be nonblack (and fully on) for every pixel+component where there are differences -->
+          <feComposite result="c" in="c1" in2="c2" operator="arithmetic" k2="255" k3="255" />
+          <!-- a will be opaque for every pixel with differences and transparent for all others -->
+          <feColorMatrix result="a" type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  1 1 1 0 0" />
+
+          <!-- a, dilated by 1 pixel -->
+          <feMorphology result="dila1" in="a" operator="dilate" radius="1" />
+          <!-- a, dilated by 2 pixels -->
+          <feMorphology result="dila2" in="dila1" operator="dilate" radius="1" />
+
+          <!-- all the pixels in the 2-pixel dilation of a but not in the 1-pixel dilation, to highlight the diffs -->
+          <feComposite result="highlight" in="dila2" in2="dila1" operator="out" />
+
+          <feFlood result="red" flood-color="red" />
+          <feComposite result="redhighlight" in="red" in2="highlight" operator="in" />
+          <feFlood result="black" flood-color="black" flood-opacity="0.5" />
+          <feMerge>
+            <feMergeNode in="black" />
+            <feMergeNode in="redhighlight" />
+          </feMerge>
+        </filter>
+      </defs>
+      <g onmousemove="magnify(evt)">
+        <image x="0" y="0" width="100%" height="100%" id="image1" />
+        <image x="0" y="0" width="100%" height="100%" id="image2" />
+      </g>
+      <rect id="diffrect" filter="url(#showDifferences)" pointer-events="none" x="0" y="0" width="100%" height="100%" />
+    </svg>
+    <div id="pixel-differences"></div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-missing-100-percent-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-missing-100-percent-ref.html
new file mode 100644
index 00000000000..7a0046f27b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-missing-100-percent-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<body>
+  <canvas id="canvas" width="100" height="100"></canvas>
+</body>
+<script>
+  var canvas = document.getElementById('canvas');
+  var ctx = canvas.getContext('2d');
+  ctx.fillStyle = 'rgb(0, 100, 100)';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html
new file mode 100644
index 00000000000..0f1ef1e8772
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-missing-100-percent.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-color">
+<link rel="match" href="animation-fallback-missing-100-percent-ref.html">
+<style>
+.container {
+  /*TODO(crbug.com/1163949): Support animation keyframes without 0% or 100%.*/
+  width: 100px;
+  height: 100px;
+  background-color: green;
+  /* Use a long animation that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animation in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated property value. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animation is ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: bgcolor 1000000s cubic-bezier(0,1,1,0) -500000s;
+}
+@keyframes bgcolor {
+  0% { background-color: rgb(200, 0, 0); }
+  20% { background-color: rgb(0, 200, 0); }
+  80% { background-color: rgb(0, 0, 200); }
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<body>
+<div class="container"></div>
+
+<script>
+document.getAnimations()[0].ready.then(() => {
+  takeScreenshot();
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-replace-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-replace-ref.html
new file mode 100644
index 00000000000..271281cf884
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-replace-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<body>
+  <canvas id="canvas" width="100" height="100"></canvas>
+</body>
+<script>
+  var canvas = document.getElementById('canvas');
+  var ctx = canvas.getContext('2d');
+  ctx.fillStyle = 'rgb(0, 0, 100)';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-replace.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-replace.html
new file mode 100644
index 00000000000..61330686631
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/animation-fallback-replace.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-color">
+<link rel="match" href="animation-fallback-replace-ref.html">
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+  /* Use a long animation that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animation in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated property value. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animation is ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: red 1000000s cubic-bezier(0,1,1,0) -500000s, green 1000000s cubic-bezier(0,1,1,0) -500000s, blue 1000000s cubic-bezier(0,1,1,0) -500000s;
+}
+@keyframes red {
+  0% { background-color: rgb(0, 0, 0); }
+  100% { background-color: rgb(200, 0, 0); }
+}
+@keyframes green {
+  0% { background-color: rgb(0, 0, 0); }
+  100% { background-color: rgb(0, 200, 0); }
+}
+@keyframes blue {
+  0% { background-color: rgb(0, 0, 0); }
+  100% { background-color: rgb(0, 0, 200); }
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<body>
+<div class="container"></div>
+
+<script>
+document.getAnimations()[0].ready.then(() => {
+  takeScreenshot();
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-006.html
new file mode 100644
index 00000000000..b5d49c4824c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-006.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://crbug.com/1102183">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#algo-main-item" title="Part E">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="used flex base size includes percent padding on grid items.">
+
+<style>
+#reference-overlapped-red {
+  position: absolute;
+  background-color: red;
+  width: 100px;
+  height: 100px;
+  z-index: -1;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id=reference-overlapped-red></div>
+
+<div style="display: flex; width: 100px;">
+  <div style="display: grid; padding-right: 100%; height: 100px; background: green;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/history-restore-anchors.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/history-restore-anchors.html
index 24dfcf72ec3..ecd7806bc93 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/history-restore-anchors.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/history-restore-anchors.html
@@ -2,49 +2,35 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<style>
-  body {
-    margin: 0px;
-    height: 2000px;
-    width: 2000px;
-  }
-
-  #first {
-    height: 1000px;
-    background-color: #FFA5D2;
-  }
-
-  #anchor {
-    position: absolute;
-    background-color: #84BE6A;
-    height: 600px;
-    width: 100%;
-  }
-</style>
-
-<div id="first"></div>
-<div id="changer"></div>
-<div id="anchor"></div>
 
 <script>
+  var win;
+  var messageCount = 0;
   // Navigation steps:
   // 1- page gets loaded and anchor element gets scrolled into view.
   // 2- loaded page refreshed.
   async_test(function(t) {
-    if (window.name == 'second/load') {
-      assert_equals(window.scrollY, 1000);
-      // Change height of content above anchor.
-      var ch = document.getElementById('changer');
-      ch.style.height = 100;
-      // Height of first + height changer.
-      assert_equals(window.scrollY, 1100)
-      t.done();
-    } else {
-      var anchor = document.getElementById('anchor');
-      anchor.scrollIntoView();
-      assert_equals(window.scrollY, 1000);
-      window.name = "second/load";
-      window.location.reload();
-    }
+    window.onmessage = function() {
+      if (++messageCount == 1) {
+        t.step(() => {
+          var anchor = win.document.getElementById('anchor');
+          anchor.scrollIntoView();
+          assert_equals(win.scrollY, 1000);
+          win.location.reload();
+        });
+      } else {
+         t.step(() => {
+            assert_equals(win.scrollY, 1000);
+            // Change height of content above anchor.
+            var ch = win.document.getElementById('changer');
+            ch.style.height = 100;
+            // Height of first + height changer.
+            assert_equals(win.scrollY, 1100)
+            t.done();
+        });
+        win.close();
+      }
+    };
+    win = window.open('support/history-restore-anchors-new-window.html');
   }, 'Verify scroll anchoring interaction with history restoration');
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html
new file mode 100644
index 00000000000..bd8290e793d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html
@@ -0,0 +1,29 @@
+<style>
+  body {
+    margin: 0px;
+    height: 2000px;
+    width: 2000px;
+  }
+
+  #first {
+    height: 1000px;
+    background-color: #FFA5D2;
+  }
+
+  #anchor {
+    position: absolute;
+    background-color: #84BE6A;
+    height: 600px;
+    width: 100%;
+  }
+</style>
+
+<div id="first"></div>
+<div id="changer"></div>
+<div id="anchor"></div>
+
+<script>
+onload = function() {
+  opener.postMessage("loaded", "*");
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html
new file mode 100644
index 00000000000..97842a26e19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: div block size + percentage resolution</title>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="height: 100px; width: 50px;">
+  <div style="height: 100%; aspect-ratio: 1/1; background: green"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html
index 3b7abf76462..0fc196cbecd 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html
@@ -42,6 +42,8 @@
 
   <div id="one" tabindex="0">Click me.</div>
   <script>
+    setup({ explicit_done: true });
+
     document.body.addEventListener("keydown", (e) => {
       delete document.body.dataset.hadmousedown;
       document.body.dataset.hadkeydown = "";
@@ -75,7 +77,7 @@
       });
 
       one.addEventListener("focus", handle_initial_focus);
-      test_driver.click(one);
+      test_driver.click(one).then(() => done());
     }, "Using keyboard while element is focused should trigger :focus-visible; using mouse without moving focus should not cancel it; moving focus using mouse should cancel it.");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-013.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-013.html
index 11cf4d7216a..a259a1cc734 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-013.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-013.html
@@ -44,10 +44,12 @@
 <div id="target" tabindex="0">Target</div>
 
 <script>
+  setup({ explicit_done: true });
+
   async_test(function(t) {
     initial.addEventListener("focus", t.step_func(function() {
       assert_equals(getComputedStyle(initial).outlineColor, "rgb(0, 128, 0)", `outlineColor for ${initial.tagName}#${initial.id} should be green`);
-      test_driver.click(target);
+      test_driver.click(target).then(() => done());
     }));
 
     target.addEventListener("focus", t.step_func_done(function() {
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/document-domain.tentative.sub.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/document-domain.tentative.sub.html
new file mode 100644
index 00000000000..65de95c9a38
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/document-domain.tentative.sub.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+
+<body>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+
+  <script>
+    document.domain = "{{host}}";
+
+    async_test(t => {
+      const iframe = document.createElement('iframe');
+      iframe.src = "//{{domains[www1]}}:{{location[port]}}/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html";
+      iframe.onload = () => {
+        iframe.contentWindow.postMessage({
+          type: "set document.domain",
+          newValue: "{{host}}"
+        }, "*");
+      };
+
+      window.addEventListener('message', t.step_func(e => {
+        if (e.source == iframe.contentWindow) {
+          assert_equals(e.data.oldDomain, "{{domains[www1]}}");
+          assert_equals(e.data.newDomain, "{{host}}");
+          t.done();
+        }
+      }));
+
+      document.body.appendChild(iframe);
+    }, 'document.domain should be enabled in subframe.');
+
+    async_test(t => {
+      const iframe = document.createElement('iframe');
+      iframe.src = "//{{domains[www1]}}:{{location[port]}}/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html";
+      iframe.onload = () => {
+        iframe.contentWindow.postMessage({
+          type: "set document.domain",
+          newValue: "{{host}}"
+        }, "*");
+      };
+
+      window.addEventListener('message', t.step_func(e => {
+        if (e.source == iframe.contentWindow) {
+          assert_equals(e.data.oldDomain, "{{domains[www1]}}");
+          assert_equals(e.data.newDomain, "{{domains[www1]}}");
+          t.done();
+        }
+      }));
+
+      document.body.appendChild(iframe);
+    }, 'document.domain should be disabled in subframe.');
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html
new file mode 100644
index 00000000000..124ee143eee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<body>
+  <script>
+    window.onmessage = e => {
+      if (e.data.type === "set document.domain") {
+        oldDomain = document.domain;
+        document.domain = e.data.newValue;
+        e.source.postMessage({
+          oldDomain,
+          newDomain: document.domain
+        }, "*");
+      }
+    };
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html.headers b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html.headers
new file mode 100644
index 00000000000..57b46a600c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-disabled.html.headers
@@ -0,0 +1 @@
+Document-Policy: document-domain=?0
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html
new file mode 100644
index 00000000000..fe03af0dbbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<body>
+  <script>
+    window.onmessage = e => {
+      if (e.data.type === "set document.domain") {
+        oldDomain = document.domain;
+        document.domain = e.data.newValue;
+        e.source.postMessage({
+          oldDomain,
+          newDomain: document.domain
+        }, "*");
+      }
+    };
+  </script>
+</body>
+
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html.headers b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html.headers
new file mode 100644
index 00000000000..89ccbe756df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-domain/resources/document-domain-enabled.html.headers
@@ -0,0 +1 @@
+Document-Policy: document-domain
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/dom/nodes/aria-element-reflection.tentative.html b/tests/wpt/web-platform-tests/dom/nodes/aria-element-reflection.tentative.html
index 9073e52075a..fc20df6696e 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/aria-element-reflection.tentative.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/aria-element-reflection.tentative.html
@@ -181,10 +181,8 @@
     deletionParent.ariaActiveDescendantElement = idlAttrElement;
     assert_equals(deletionParent.getAttribute("aria-activedescendant"), "idlAttrElement");
 
-    // The element is still retrieved because it was explicitly set, and was at that point
-    // in a valid scope.
     deletionParent.removeChild(idlAttrElement);
-    assert_equals(deletionParent.ariaActiveDescendantElement, idlAttrElement);
+    assert_equals(deletionParent.ariaActiveDescendantElement, null);
 
     // The content attribute will still reflect the id.
     assert_equals(deletionParent.getAttribute("aria-activedescendant"), "idlAttrElement");
@@ -221,8 +219,9 @@
   }, "Changing the ID of an element causes the content attribute to become out of sync.");
   </script>
 
+  <!-- TODO(chrishall): change naming scheme to inner/outer -->
   <div id="lightParent" role="listbox">
-    <div role="option" id="lightElement">Hello world!</div>
+    <div id="lightElement" role="option">Hello world!</div>
   </div>
   <div id="shadowHostElement"></div>
 
@@ -231,23 +230,104 @@
     const lightElement = document.getElementById("lightElement");
     const shadowRoot = shadowHostElement.attachShadow({mode: "open"});
 
+    assert_equals(lightParent.ariaActiveDescendantElement, null, 'null before');
+    assert_equals(lightParent.getAttribute('aria-activedescendant'), null, 'null before');
+
     lightParent.ariaActiveDescendantElement = lightElement;
     assert_equals(lightParent.ariaActiveDescendantElement, lightElement);
+    assert_equals(lightParent.getAttribute('aria-activedescendant'), "lightElement");
 
-    // Move the referenced element into shadow DOM. As it was explicitly set,
-    // it is still able to be gotten even though it is in a different scope.
+    // Move the referenced element into shadow DOM.
+    // This will cause the computed attr-associated element to be null as the
+    // referenced element will no longer be in a valid scope.
+    // The underlying reference is kept intact, so if the referenced element is
+    // later restored to a valid scope the computed attr-associated element will
+    // then reflect
     shadowRoot.appendChild(lightElement);
-    assert_equals(lightParent.ariaActiveDescendantElement, lightElement);
+    assert_equals(lightParent.ariaActiveDescendantElement, null, "computed attr-assoc element should be null as referenced element is in an invalid scope");
     assert_equals(lightParent.getAttribute("aria-activedescendant"), "lightElement");
 
     // Move the referenced element back into light DOM.
+    // Since the underlying reference was kept intact, after moving the
+    // referenced element back to a valid scope should be reflected in the
+    // computed attr-associated element.
     lightParent.appendChild(lightElement);
-    assert_equals(lightParent.ariaActiveDescendantElement, lightElement);
+    assert_equals(lightParent.ariaActiveDescendantElement, lightElement, "computed attr-assoc element should be restored as referenced element is back in a valid scope");
     assert_equals(lightParent.getAttribute("aria-activedescendant"), "lightElement");
-  }, "Reparenting an element into a descendant shadow scope nullifies the element reference.");
+  }, "Reparenting an element into a descendant shadow scope hides the element reference.");
   </script>
 
-  <div id="billingElement">Billing</div>
+  <div id='fruitbowl' role='listbox'>
+    <div id='apple' role='option'>I am an apple</div>
+    <div id='pear' role='option'>I am a pear</div>
+    <div id='banana' role='option'>I am a banana</div>
+  </div>
+  <div id='shadowFridge'></div>
+
+  <script>
+  test(function(t) {
+    const shadowRoot = shadowFridge.attachShadow({mode: "open"});
+    const banana = document.getElementById("banana");
+
+    fruitbowl.ariaActiveDescendantElement = apple;
+    assert_equals(fruitbowl.ariaActiveDescendantElement, apple);
+    assert_equals(fruitbowl.getAttribute("aria-activedescendant"), "apple");
+
+    // Move the referenced element into shadow DOM.
+    shadowRoot.appendChild(apple);
+    assert_equals(fruitbowl.ariaActiveDescendantElement, null, "computed attr-assoc element should be null as referenced element is in an invalid scope");
+    // Note that the content attribute is NOT cleared.
+    assert_equals(fruitbowl.getAttribute("aria-activedescendant"), "apple");
+
+    // let us rename our banana to an apple
+    banana.setAttribute("id", "apple");
+    const lyingBanana = document.getElementById("apple");
+    assert_equals(lyingBanana, banana);
+
+    // our ariaActiveDescendantElement thankfully isn't tricked.
+    // this is thanks to the underlying reference being kept intact, it is
+    // checked and found to be in an invalid scope and therefore the content
+    // attribute fallback isn't used.
+    assert_equals(fruitbowl.ariaActiveDescendantElement, null);
+    // our content attribute still returns "apple",
+    // even though fetching that by id would give us our lying banana.
+    assert_equals(fruitbowl.getAttribute("aria-activedescendant"), "apple");
+
+    // when we remove our IDL attribute, the content attribute is also thankfully cleared.
+    fruitbowl.ariaActiveDescendantElement = null;
+    assert_equals(fruitbowl.ariaActiveDescendantElement, null);
+    assert_equals(fruitbowl.getAttribute("aria-activedescendant"), null);
+  }, "Reparenting referenced element cannot cause retargeting of reference.");
+  </script>
+
+  <div id='toaster' role='listbox'></div>
+  <div id='shadowPantry'></div>
+
+  <script>
+  test(function(t) {
+    const shadowRoot = shadowPantry.attachShadow({mode: "open"});
+
+    // Our toast starts in the shadowPantry.
+    const toast = document.createElement("div");
+    toast.setAttribute("id", "toast");
+    shadowRoot.appendChild(toast);
+
+    // Prepare my toast for toasting
+    toaster.ariaActiveDescendantElement = toast;
+    assert_equals(toaster.ariaActiveDescendantElement, null);
+    assert_equals(toaster.getAttribute("aria-activedescendant"), "");
+
+    // Time to make some toast
+    toaster.appendChild(toast);
+    assert_equals(toaster.ariaActiveDescendantElement, toast);
+    // Current spec behaviour:
+    assert_equals(toaster.getAttribute("aria-activedescendant"), "");
+  }, "Element reference set in invalid scope remains intact throughout move to valid scope.");
+  </script>
+
+  <div id="billingElementContainer">
+      <div id="billingElement">Billing</div>
+  </div>
   <div>
       <div id="nameElement">Name</div>
       <input type="text" id="input1" aria-labelledby="billingElement nameElement"/>
@@ -267,9 +347,15 @@
     assert_array_equals(input2.ariaLabelledByElements, [billingElement, addressElement], "Testing IDL setter/getter.");
     assert_equals(input2.getAttribute("aria-labelledby"), "billingElement addressElement");
 
-    // Remove the element from the DOM, but as it was explicitly set whilst in a valid scope
-    // it can still be retrieved.
+    // Remove the billingElement from the DOM.
+    // As it was explicitly set the underlying association will remain intact,
+    // but it will be hidden until the element is moved back into a valid scope.
     billingElement.remove();
+    assert_array_equals(input2.ariaLabelledByElements, [addressElement]);
+
+    // Insert the billingElement back into the DOM and check that it is visible
+    // again, as the underlying association should have been kept intact.
+    billingElementContainer.appendChild(billingElement);
     assert_array_equals(input2.ariaLabelledByElements, [billingElement, addressElement]);
 
     input2.ariaLabelledByElements = [];
@@ -445,8 +531,8 @@
     // Elements that cross into shadow DOM are dropped, only reflect the valid
     // elements in IDL and in the content attribute.
     lightDomHeading.ariaFlowToElements = [shadowChild1, shadowChild2, lightDomText1, lightDomText2];
-    assert_array_equals(lightDomHeading.ariaFlowToElements, [lightDomText1, lightDomText2]);
-    assert_equals(lightDomHeading.getAttribute("aria-flowto"), "lightDomText1 lightDomText2", "empty content attribute if any given elements cross shadow boundaries");
+    assert_array_equals(lightDomHeading.ariaFlowToElements, [lightDomText1, lightDomText2], "IDL should only include valid elements");
+    assert_equals(lightDomHeading.getAttribute("aria-flowto"), "", "empty content attribute if any given elements cross shadow boundaries");
 
     // Using a mixture of elements in the same scope and in a shadow including
     // ancestor should set the IDL attribute, but should reflect the empty
@@ -479,29 +565,28 @@
     describedElement.ariaDescribedByElements = [description1, description2];
 
     // All elements were in the same scope, so elements are gettable and the content attribute reflects the ids.
-    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2]);
+    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2], "same scope reference");
     assert_equals(describedElement.getAttribute("aria-describedby"), "buttonDescription1 buttonDescription2");
 
     outerShadowRoot.appendChild(describedElement);
 
     // Explicitly set attr-associated-elements should still be gettable because we are referencing elements in a lighter scope.
     // The content attr still reflects the ids from the explicit elements because they were in a valid scope at the time of setting.
-    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2]);
+    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2], "lighter scope reference");
     assert_equals(describedElement.getAttribute("aria-describedby"), "buttonDescription1 buttonDescription2");
 
     // Move the explicitly set elements into a deeper shadow DOM to test the relationship should not be gettable.
     innerShadowRoot.appendChild(description1);
     innerShadowRoot.appendChild(description2);
 
-    // Explicitly set elements are still retrieved, because they were in a valid scope when they were set.
-    // The content attribute still reflects the ids.
-    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2]);
+    // Explicitly set elements are no longer retrievable, because they are no longer in a valid scope.
+    assert_array_equals(describedElement.ariaDescribedByElements, [], "invalid scope reference");
     assert_equals(describedElement.getAttribute("aria-describedby"), "buttonDescription1 buttonDescription2");
 
     // Move into the same shadow scope as the explicitly set elements to test that the elements are gettable
     // and reflect the correct IDs onto the content attribute.
     innerShadowRoot.appendChild(describedElement);
-    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2]);
+    assert_array_equals(describedElement.ariaDescribedByElements, [description1, description2], "restored valid scope reference");
     assert_equals(describedElement.getAttribute("aria-describedby"), "buttonDescription1 buttonDescription2");
   }, "Moving explicitly set elements across shadow DOM boundaries.");
   </script>
@@ -539,20 +624,21 @@
       headingElement.ariaLabelledByElements = [headingLabel1, headingLabel2];
       assert_equals(headingElement.getAttribute("aria-labelledby"), "headingLabel1 headingLabel2", "Elements are set again, so the content attribute is updated.");
 
-      // Remove the referring element from the DOM, elements are gettable.
+      // Remove the referring element from the DOM, elements are no longer longer exposed,
+      // underlying internal reference is still kept intact.
       headingElement.remove();
-      assert_array_equals(headingElement.ariaLabelledByElements, [headingLabel1, headingLabel2], "Element is no longer in the document, but references should be gettable.");
+      assert_array_equals(headingElement.ariaLabelledByElements, [], "Element is no longer in the document, so references should no longer be exposed.");
       assert_equals(headingElement.getAttribute("aria-labelledby"), "headingLabel1 headingLabel2");
 
       // Insert it back in.
       sameScopeContainer.appendChild(headingElement);
-      assert_array_equals(headingElement.ariaLabelledByElements, [headingLabel1, headingLabel2]);
+      assert_array_equals(headingElement.ariaLabelledByElements, [headingLabel1, headingLabel2], "Element is restored to valid scope, so should be gettable.");
       assert_equals(headingElement.getAttribute("aria-labelledby"), "headingLabel1 headingLabel2");
 
-      // Remove everything from the DOM, everything is still gettable.
+      // Remove everything from the DOM, nothing is exposed again.
       headingLabel1.remove();
       headingLabel2.remove();
-      assert_array_equals(headingElement.ariaLabelledByElements, [headingLabel1, headingLabel2]);
+      assert_array_equals(headingElement.ariaLabelledByElements, []);
       assert_equals(headingElement.getAttribute("aria-labelledby"), "headingLabel1 headingLabel2");
       assert_equals(document.getElementById("headingLabel1"), null);
       assert_equals(document.getElementById("headingLabel2"), null);
@@ -579,4 +665,47 @@
       // See: https://github.com/whatwg/html/pull/3917#issuecomment-527263562
       assert_equals(input.ariaActiveDescendantElement, first);
     }, "Reparenting.");
+  </script>
+
+  <div id='fromDiv'></div>
+
+  <script>
+    test(function(t) {
+      const toSpan = document.createElement('span');
+      toSpan.setAttribute("id", "toSpan");
+      fromDiv.ariaActiveDescendantElement = toSpan;
+
+      assert_equals(fromDiv.ariaActiveDescendantElement, null, "Referenced element not inserted into document, so is in an invalid scope.");
+      assert_equals(fromDiv.getAttribute("aria-activedescendant"), "", "Invalid scope, so content attribute not set.");
+
+      fromDiv.appendChild(toSpan);
+      assert_equals(fromDiv.ariaActiveDescendantElement, toSpan, "Referenced element now inserted into the document.");
+      assert_equals(fromDiv.getAttribute("aria-activedescendant"), "", "Content attribute remains empty, as it is only updated at set time.");
+
+    }, "Attaching element reference before it's inserted into the DOM.");
+  </script>
+
+  <div id='originalDocumentDiv'></div>
+
+  <script>
+    test(function(t) {
+      const newDoc = document.implementation.createHTMLDocument('new document');
+      const newDocSpan = newDoc.createElement('span');
+      newDoc.body.appendChild(newDocSpan);
+
+      // Create a reference across documents.
+      originalDocumentDiv.ariaActiveDescendantElement = newDocSpan;
+
+      assert_equals(originalDocumentDiv.ariaActiveDescendantElement, null, "Cross-document is an invalid scope, so reference will not be visible.");
+      assert_equals(fromDiv.getAttribute("aria-activedescendant"), "", "Invalid scope when set, so content attribute not set.");
+
+      // "Move" span to first document.
+      originalDocumentDiv.appendChild(newDocSpan);
+
+      // Implementation defined: moving object into same document from other document may cause reference to become visible.
+      assert_equals(originalDocumentDiv.ariaActiveDescendantElement, newDocSpan, "Implementation defined: moving object back *may* make reference visible.");
+      assert_equals(fromDiv.getAttribute("aria-activedescendant"), "", "Invalid scope when set, so content attribute not set.");
+    }, "Cross-document references and moves.");
+  </script>
+
 </html>
diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-labels.any.js b/tests/wpt/web-platform-tests/encoding/textdecoder-labels.any.js
index ed407a32547..efc4ae2d2ea 100644
--- a/tests/wpt/web-platform-tests/encoding/textdecoder-labels.any.js
+++ b/tests/wpt/web-platform-tests/encoding/textdecoder-labels.any.js
@@ -1,5 +1,6 @@
 // META: title=Encoding API: Encoding labels
 // META: script=resources/encodings.js
+// META: timeout=long
 
 var whitespace = [' ', '\t', '\n', '\f', '\r'];
 encodings_table.forEach(function(section) {
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js
index ed191da99a7..f4555f7d1db 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.composite.uncovered.fill.destination-in
 // Description:fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
index b89beed86fb..219e90d36d8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.3arg
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
index 4d8b4bafd7f..005235a2435 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.5arg
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
index 9d6913aae93..3f26c729ce8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.9arg.basic
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
index b4a2402df76..ed9a7256709 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.9arg.destpos
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
index 5ad01d6715d..8cc77489304 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.9arg.destsize
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
index 9679ee4cfac..6697bfeb8d7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.9arg.sourcepos
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
index bfcafa95122..7079998786c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.9arg.sourcesize
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
index 2621c5f8e12..791665c9daf 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.alpha
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
index 4678ba3c5c2..e92ffd652e9 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.animated.poster
 // Description:drawImage() of an APNG draws the poster frame
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
index 31e1241ab51..ab5f2d67d5c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.broken
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
index 09985f437e6..8ab99fe152f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.canvas
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
index 886a84d1a4f..39e6a924345 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.clip
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
index ec2185b13d8..cf3b6c7129b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.composite
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
index 95da2113bbe..28a74799136 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.floatsource
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
index 29c64a3c133..95749c43759 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.negativedest
 // Description:Negative destination width/height represents the correct rectangle
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
index a1a64c34a35..23eb5a21bbd 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.negativedir
 // Description:Negative dimensions do not affect the direction of the image
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
index 19353c38c81..b27638554bd 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.negativesource
 // Description:Negative source width/height represents the correct rectangle
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
index 91ef15c8bc3..0daa4c687e8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.nonfinite
 // Description:drawImage() with Infinity/NaN is ignored
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
index a4be66b950e..cd1bc0b8ba5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.nowrap
 // Description:Stretched images do not get pixels wrapping around the edges
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
index 5c9d7749006..0572dd5addb 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.null
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
index 497b837579b..1916238531a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.path
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
index fbcf171f606..17fcd2ad49d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.self.1
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
index 524e91c8f0b..adfeea5d93b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.self.2
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
index 6fc5e843458..6189edc5c38 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.svg
 // Description:drawImage() of an SVG image
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
index a8b8b9aa1f8..791c7102702 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.transform
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
index 418c9b2ebe3..c3b945ca0e7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.wrongtype
 // Description:Incorrect image types in drawImage do not match any defined overloads, so WebIDL throws a TypeError
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
index fb23cee4b49..7d6f9767dcb 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.zerocanvas
 // Description:
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
index 200a311f7b2..8901d7207d7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.zerosource.image
 // Description:drawImage with zero-sized source rectangle from image draws nothing without exception
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
index 37ef6d87352..7d5994edb3a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.drawImage.zerosource
 // Description:drawImage with zero-sized source rectangle draws nothing without exception
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html
index a5c6645bbb3..6174ddeb1e1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <title>OffscreenCanvas test: 2d.text.draw.fill.maxWidth.zero</title>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js
index 4c326be7577..eaeb45829e5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.text.draw.fill.maxWidth.zero
 // Description:fillText handles maxWidth correctly
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/gentestutils.py b/tests/wpt/web-platform-tests/html/canvas/tools/gentestutils.py
index b6861db5f9e..1ff2c779396 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/gentestutils.py
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/gentestutils.py
@@ -403,6 +403,8 @@ def genTestUtils(TESTOUTPUTDIR, IMAGEOUTPUTDIR, TEMPLATEFILE, NAME2DIRFILE, ISOF
             f = codecs.open('%s/%s%s.html' % (TESTOUTPUTDIR, mapped_name, name_variant), 'w', 'utf-8')
             f.write(templates['w3c'] % template_params)
             if ISOFFSCREENCANVAS:
+                timeout = '// META: timeout=%s\n' % test['timeout'] if 'timeout' in test else ''
+                template_params['timeout'] = timeout
                 f = codecs.open('%s/%s%s.worker.js' % (TESTOUTPUTDIR, mapped_name, name_variant), 'w', 'utf-8')
                 f.write(templates['w3cworker'] % template_params)
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates-offscreen.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/templates-offscreen.yaml
index 58cec883c6a..b9d78567cc2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/templates-offscreen.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/templates-offscreen.yaml
@@ -27,7 +27,7 @@ w3c: |
 
 
 w3cworker: |
-    // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+    %(timeout)s// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
     // OffscreenCanvas test in a worker:%(name)s
     // Description:%(desc)s
     // Note:%(notes)s
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml
index b218d2d8b8b..66a5b7cf942 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml
@@ -311,6 +311,7 @@
     _assertGreen(ctx, 100, 50);
     t.done();
   expected: green
+  timeout: long
 
 - name: 2d.text.draw.fill.maxWidth.negative
   desc: fillText handles maxWidth correctly
@@ -1437,4 +1438,4 @@
     @assert ctx.textRendering === "GeometricPrecision";
     t.done();
 
-# TODO: shadows, alpha, composite, clip
\ No newline at end of file
+# TODO: shadows, alpha, composite, clip
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/001.html b/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/001.html
index f90c345740d..c0bf8a5776a 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/001.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/001.html
@@ -11,11 +11,6 @@
 test(function() {
   assert_own_property(window,'DragEvent');
 }, 'window.DragEvent should be exposed' );
-test(function() {
-  assert_throws_dom('NOT_SUPPORTED_ERR', function() {
-    var evt = document.createEvent('DragEvent');
-  });
-}, 'createEvent should not be able to create a DragEvent' );
 test(function() {
   var evt = new DragEvent('dragstart');
   assert_false( !!evt.initDragEvent, 'initDragEvent' );
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html
new file mode 100644
index 00000000000..bcba6f064c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-popup-element/popup-stacking.tentative.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel=help href="https://github.com/MicrosoftEdge/MSEdgeExplainers/blob/main/Popup/explainer.md">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<popup id=p1 anchor=b1><p>This is popup #1</p>
+  <button id=b2 onclick='p2.show()'>Popup 2</button>
+  <button id=b4 onclick='p4.show()'>Popup 4</button>
+</popup>
+<popup id=p2 anchor=b2><p>This is popup #2</p>
+  <button id=b3 onclick='p3.show()'>Popup 3</button>
+</popup>
+<popup id=p3 anchor=b3><p>This is popup #3</p></popup>
+<popup id=p4 anchor=b4><p>This is popup #4</p></popup>
+
+<button id=b1 onclick='p1.show()'>Popup 1</button>
+
+<script>
+  const popups = [p1, p2, p3, p4];
+
+  function assertState(...states) {
+    assert_equals(popups.length,states.length);
+    for(let i=0;i<popups.length;++i) {
+      assert_equals(popups[i].open,states[i],`Popup #${i+1} incorrect state`);
+    }
+  }
+  test(function() {
+    assertState(false,false,false,false);
+    p1.show();
+    assertState(true,false,false,false);
+    p2.show();
+    assertState(true,true,false,false);
+    p3.show();
+    assertState(true,true,true,false);
+    // P4 is a sibling of P2, so showing it should
+    // close P2 and P3.
+    p4.show();
+    assertState(true,false,false,true);
+    // P2 should close P4 now.
+    p2.show();
+    assertState(true,true,false,false);
+    // Hiding P1 should hide all.
+    p1.hide();
+    assertState(false,false,false,false);
+  }, "popup stacking behavior")
+</script>
+
+<style>
+  #p1 { top:350px; }
+  #p2 { top:350px; left:200px; }
+  #p3 { top:500px; }
+  #p4 { top:500px;left:200px; }
+</style>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js
deleted file mode 100644
index 45570b35abf..00000000000
--- a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js
+++ /dev/null
@@ -1,13 +0,0 @@
-async_test(t => {
-  const frame = document.body.appendChild(document.createElement("iframe"));
-  assert_equals(frame.contentDocument.open(), frame.contentDocument);
-  assert_equals(frame.contentDocument.documentElement, null);
-  frame.contentDocument.write("<div>heya</div>");
-  frame.contentDocument.close();
-  frame.contentWindow.addEventListener("pageshow", function() {
-    t.step(function() {
-      assert_true(true, "Got pageshow event");
-    });
-    t.done();
-  });
-}, "document.open(), and the pageshow events");
diff --git a/tests/wpt/web-platform-tests/interfaces/xhr.idl b/tests/wpt/web-platform-tests/interfaces/xhr.idl
index d6d8193e1c3..3abd09ce5ed 100644
--- a/tests/wpt/web-platform-tests/interfaces/xhr.idl
+++ b/tests/wpt/web-platform-tests/interfaces/xhr.idl
@@ -83,7 +83,7 @@ interface FormData {
   iterable<USVString, FormDataEntryValue>;
 };
 
-[Exposed=(Window,DedicatedWorker,SharedWorker)]
+[Exposed=(Window,Worker)]
 interface ProgressEvent : Event {
   constructor(DOMString type, optional ProgressEventInit eventInitDict = {});
 
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index fea1f2f52e9..11e31b133dd 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -1192,7 +1192,7 @@ policies and contribution forms [3].
                 if (tests.output) {
                     tests.set_assert(name, ...args);
                 }
-                rv = f(...args);
+                const rv = f(...args);
                 status = Test.statuses.PASS;
                 return rv;
             } catch(e) {
@@ -3765,7 +3765,7 @@ policies and contribution forms [3].
 
     AssertionError.prototype = Object.create(Error.prototype);
 
-    get_stack = function() {
+    const get_stack = function() {
         var stack = new Error().stack;
         // IE11 does not initialize 'Error.stack' until the object is thrown.
         if (!stack) {
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html
new file mode 100644
index 00000000000..245e338a3b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content=":focus should match a shadow host which contains the focused element">
+<link rel="help" href="https://html.spec.whatwg.org/#element-has-the-focus">
+<link rel="help=" href="https://bugs.webkit.org/show_bug.cgi?id=202432">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<input id="defaultFocus" autofocus>
+<div id="log"></div>
+<div id="container"></div>
+<script>
+
+let focusedDefault = false;
+function didFocusDefault() { }
+function checkFocusMatch() {
+    focusedDefault = true;
+    didFocusDefault();
+}
+defaultFocus.addEventListener('focus', checkFocusMatch);
+
+function prepare(test)
+{
+    test.add_cleanup(() => {
+        defaultFocus.focus();
+        container.textContent = '';
+    });
+    return new Promise((resolve) => {
+        if (focusedDefault)
+            resolve();
+        else
+            didFocusDefault = resolve;
+    });
+}
+
+function testInMode(mode) {
+    promise_test(async function () {
+        await prepare(this);
+        const host = document.createElement('div');
+        container.appendChild(host);
+        const shadowRoot = host.attachShadow({mode});
+        shadowRoot.innerHTML = '<input>';
+        assert_equals(document.activeElement, defaultFocus);
+        assert_equals(shadowRoot.activeElement, null);
+        assert_false(host.matches(':focus'));
+    }, `:focus must not match a shadow host with ${mode} mode shadow root that does not contain the focused element`);
+
+    promise_test(async function () {
+        await prepare(this);
+        const host = document.createElement('div');
+        document.body.appendChild(host);
+        const shadowRoot = host.attachShadow({mode});
+        shadowRoot.innerHTML = '<input>';
+        shadowRoot.firstChild.focus();
+        assert_equals(document.activeElement, host);
+        assert_equals(shadowRoot.activeElement, shadowRoot.firstChild);
+        assert_true(host.matches(':focus'));
+    }, `:focus must match a shadow host with ${mode} mode shadow root that contains the focused element`);
+
+    promise_test(async function () {
+        await prepare(this);
+        const host = document.createElement('div');
+        container.appendChild(host);
+        const shadowRoot = host.attachShadow({mode});
+        shadowRoot.innerHTML = '<slot>';
+        host.innerHTML = '<input>';
+        host.firstChild.focus();
+        assert_equals(document.activeElement, host.firstChild);
+        assert_equals(shadowRoot.activeElement, null);
+        assert_false(host.matches(':focus'));
+    }, `:focus must not match a shadow host with ${mode} mode shadow root contains the focused element assigned to a slot`);
+
+}
+
+testInMode('open');
+testInMode('closed');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html
new file mode 100644
index 00000000000..ba900d6a6d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content=":focus should match a shadow host which contains the focused element">
+<link rel="help" href="https://html.spec.whatwg.org/#element-has-the-focus">
+<link rel="help=" href="https://bugs.webkit.org/show_bug.cgi?id=202432">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+</head>
+<body>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="host"></div>
+<style>
+#host { background: red; width: 100px; height: 100px; }
+#host:focus { background: green; }
+</style>
+<script>
+
+const shadowRoot = host.attachShadow({mode: 'closed'});
+shadowRoot.innerHTML = '<div tabindex="0" style="outline: none;"></div>';
+shadowRoot.firstChild.focus();
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html
new file mode 100644
index 00000000000..a605aca5a63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content=":focus should match a shadow host which contains the focused element">
+<link rel="help" href="https://html.spec.whatwg.org/#element-has-the-focus">
+<link rel="help=" href="https://bugs.webkit.org/show_bug.cgi?id=202432">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+</head>
+<body>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="host"><span>FAIL</span></div>
+<style>
+#host { background: green; width: 100px; height: 100px; }
+#host span { background: red; }
+#host:focus span { background: green; color: green; }
+</style>
+<script>
+
+const shadowRoot = host.attachShadow({mode: 'closed'});
+shadowRoot.innerHTML = '<div tabindex="0" style="outline: none;"><slot></slot></div>';
+shadowRoot.firstChild.focus();
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html
new file mode 100644
index 00000000000..e72d1b39d4c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content=":focus should not match a shadow host if the focused element is a slotted content">
+<link rel="help" href="https://html.spec.whatwg.org/#element-has-the-focus">
+<link rel="help=" href="https://bugs.webkit.org/show_bug.cgi?id=202432">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+</head>
+<body>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="host"><div id="target" tabindex="0"></div></div>
+<style>
+#host { background: green; width: 100px; height: 100px; }
+#host:focus #target { background: red; width: 100px; height: 100px; }
+#target { outline: none; }
+</style>
+<script>
+
+const shadowRoot = host.attachShadow({mode: 'closed'});
+shadowRoot.innerHTML = '<slot></slot>';
+target.focus();
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1688293.html b/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1688293.html
new file mode 100644
index 00000000000..9ab1a883126
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1688293.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<script>
+  window.addEventListener('load', () => {
+    const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
+    const clip = document.createElementNS('http://www.w3.org/2000/svg', 'clipPath')
+    const use = document.createElementNS('http://www.w3.org/2000/svg', 'use')
+    const style = document.createElementNS('http://www.w3.org/2000/svg', 'style')
+    document.documentElement.appendChild(svg)
+    svg.setAttribute('id', 'id_0')
+    clip.appendChild(use)
+    svg.appendChild(clip)
+    document.documentElement.appendChild(style)
+    style.textContent = `
+      @import url(dom--23104-J7UdNQ5SQ5Rv-.css);
+      @namespace url(http://www.w3.org/1999/xhtml);
+      @namespace svg url(http://www.w3.org/2000/svg);
+      * {
+        filter: url(#id_0);
+      }
+      svg|* {
+        transition: 352ms ! important;
+        y: 29%;
+      }`
+  })
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 8301ba1073c..d61e1f262cd 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -910,7 +910,7 @@ class MarionetteRefTestExecutor(RefTestExecutor):
                  debug_info=None, reftest_internal=False,
                  reftest_screenshot="unexpected", ccov=False,
                  group_metadata=None, capabilities=None, debug=False,
-                 browser_version=None, **kwargs):
+                 browser_version=None, debug_test=False, **kwargs):
         """Marionette-based executor for reftests"""
         RefTestExecutor.__init__(self,
                                  logger,
@@ -933,6 +933,7 @@ class MarionetteRefTestExecutor(RefTestExecutor):
         self.original_pref_values = {}
         self.group_metadata = group_metadata
         self.debug = debug
+        self.debug_test = debug_test
 
         with open(os.path.join(here, "reftest.js")) as f:
             self.script = f.read()
@@ -998,6 +999,10 @@ class MarionetteRefTestExecutor(RefTestExecutor):
             if assertion_count is not None:
                 result["extra"]["assertion_count"] = assertion_count
 
+        if self.debug_test and result["status"] in ["PASS", "FAIL", "ERROR"] and "extra" in result:
+            self.parent.base.set_window(self.parent.base.window_handles()[0])
+            self.protocol.debug.load_reftest_analyzer(test, result)
+
         return self.convert_result(test, result)
 
     def screenshot(self, test, viewport_size, dpi, page_ranges):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index e6c5f9f1a20..0a968bf3f8c 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -26,7 +26,8 @@ from .protocol import (BaseProtocolPart,
                        TestDriverProtocolPart,
                        GenerateTestReportProtocolPart,
                        SetPermissionProtocolPart,
-                       VirtualAuthenticatorProtocolPart)
+                       VirtualAuthenticatorProtocolPart,
+                       DebugProtocolPart)
 
 import webdriver as client
 from webdriver import error
@@ -292,6 +293,11 @@ class WebDriverVirtualAuthenticatorProtocolPart(VirtualAuthenticatorProtocolPart
         return self.webdriver.send_session_command("POST", "webauthn/authenticator/%s/uv" % authenticator_id, uv)
 
 
+class WebDriverDebugProtocolPart(DebugProtocolPart):
+    def load_devtools(self):
+        raise NotImplementedError()
+
+
 class WebDriverProtocol(Protocol):
     implements = [WebDriverBaseProtocolPart,
                   WebDriverTestharnessProtocolPart,
@@ -303,7 +309,8 @@ class WebDriverProtocol(Protocol):
                   WebDriverTestDriverProtocolPart,
                   WebDriverGenerateTestReportProtocolPart,
                   WebDriverSetPermissionProtocolPart,
-                  WebDriverVirtualAuthenticatorProtocolPart]
+                  WebDriverVirtualAuthenticatorProtocolPart,
+                  WebDriverDebugProtocolPart]
 
     def __init__(self, executor, browser, capabilities, **kwargs):
         super(WebDriverProtocol, self).__init__(executor, browser)
@@ -508,7 +515,7 @@ class WebDriverRefTestExecutor(RefTestExecutor):
 
     def __init__(self, logger, browser, server_config, timeout_multiplier=1,
                  screenshot_cache=None, close_after_done=True,
-                 debug_info=None, capabilities=None, **kwargs):
+                 debug_info=None, capabilities=None, debug_test=False, **kwargs):
         """WebDriver-based executor for reftests"""
         RefTestExecutor.__init__(self,
                                  logger,
@@ -523,6 +530,7 @@ class WebDriverRefTestExecutor(RefTestExecutor):
         self.implementation = RefTestImplementation(self)
         self.close_after_done = close_after_done
         self.has_window = False
+        self.debug_test = debug_test
 
         with open(os.path.join(here, "test-wait.js")) as f:
             self.wait_script = f.read() % {"classname": "reftest-wait"}
@@ -547,6 +555,9 @@ class WebDriverRefTestExecutor(RefTestExecutor):
 
         result = self.implementation.run_test(test)
 
+        if self.debug_test and result["status"] in ["PASS", "FAIL", "ERROR"] and "extra" in result:
+            self.protocol.debug.load_reftest_analyzer(test, result)
+
         return self.convert_result(test, result)
 
     def screenshot(self, test, viewport_size, dpi, page_ranges):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
index e48add9334b..05e251c7841 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -527,3 +527,20 @@ class DebugProtocolPart(ProtocolPart):
     def load_devtools(self):
         """Load devtools in the current window"""
         pass
+
+    def load_reftest_analyzer(self, test, result):
+        import io
+        import mozlog
+        from six.moves.urllib.parse import quote, urljoin
+
+        debug_test_logger = mozlog.structuredlog.StructuredLogger("debug_test")
+        output = io.StringIO()
+        debug_test_logger.suite_start([])
+        debug_test_logger.add_handler(mozlog.handlers.StreamHandler(output, formatter=mozlog.formatters.TbplFormatter()))
+        debug_test_logger.test_start(test.id)
+        # Always use PASS as the expected value so we get output even for expected failures
+        debug_test_logger.test_end(test.id, result["status"], "PASS", extra=result.get("extra"))
+
+        self.parent.base.load(urljoin(self.parent.executor.server_url("https"),
+                              "/common/third_party/reftest-analyzer.xhtml#log=%s" %
+                               quote(output.getvalue())))
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py
index 910358f5159..97d74da4e40 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py
@@ -80,10 +80,10 @@ class FontInstaller(object):
         fonts = check_output(['/usr/sbin/system_profiler', '-xml', 'SPFontsDataType'])
         try:
             # if py3
-            readPlistFromBytes = plistlib.readPlistFromBytes
+            load_plist = plistlib.loads
         except AttributeError:
-            readPlistFromBytes = plistlib.readPlistFromString
-        fonts = readPlistFromBytes(fonts)
+            load_plist = plistlib.readPlistFromString
+        fonts = load_plist(fonts)
         assert len(fonts) == 1
         for font in fonts[0]['_items']:
             if font['path'] == installed_font_path:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 60c74ef408e..2b6d4b357c9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -594,7 +594,7 @@ def check_args(kwargs):
         kwargs["reftest_internal"] = True
 
     if kwargs["reftest_screenshot"] is None:
-        kwargs["reftest_screenshot"] = "unexpected"
+        kwargs["reftest_screenshot"] = "unexpected" if not kwargs["debug_test"] else "always"
 
     if kwargs["enable_webrender"] is None:
         kwargs["enable_webrender"] = False
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html
index 081f9becbd0..2b0922d2123 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html
@@ -11,13 +11,13 @@
   // headers are set in the .headers file:
   //
   //   Content-Security-Policy: script-src 'unsafe-inline'; report-uri ...
-  //   Content-Security-Policy: plugin-types bla/blubb
+  //   Content-Security-Policy: object-src 'none'
   //   Content-Security-Policy: require-trusted-types-for 'script'
   //
-  // The last rule is there so we can provoke a CSP violation report at will.
+  // The second rule is there so we can provoke a CSP violation report at will.
   // The intent is that in order to test that a violation has *not* been thrown
   // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the img-src rule) and when that event is
+  // CSP violation (by violating the object-src rule) and when that event is
   // processed we can we sure that an earlier event - if it indeed occurred -
   // must have already been processed.
 
@@ -62,7 +62,7 @@
   // Provoke/wait for a CSP violation, in order to be sure that all previous
   // CSP violations have been delivered.
   function promise_flush() {
-    return promise_violation("plugin-types bla/blubb");
+    return promise_violation("object-src 'none'");
   }
   function flush() {
    expect_throws(_ => {
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers
index e4147bd2e37..2bdd8a7d1ab 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers
@@ -1,3 +1,3 @@
 Content-Security-Policy: script-src http: https: 'nonce-123' 'report-sample'
-Content-Security-Policy: plugin-types bla/blubb
+Content-Security-Policy: object-src 'none'
 Content-Security-Policy: require-trusted-types-for 'script'
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html
index 3fd1c9ffa8d..4e8ac5a2f43 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html
@@ -11,7 +11,7 @@
   // headers are set in the .headers file:
   //
   //   Content-Security-Policy: script-src 'unsafe-inline' 'unsafe-eval'; report-uri ...
-  //   Content-Security-Policy: plugin-types bla/blubb
+  //   Content-Security-Policy: object-src 'none'
   //   Content-Security-Policy-Report-Only: require-trusted-types-for 'script'
   //
   // The last rule is there so we can provoke a CSP violation report at will.
@@ -62,7 +62,7 @@
   // Provoke/wait for a CSP violation, in order to be sure that all previous
   // CSP violations have been delivered.
   function promise_flush() {
-    return promise_violation("plugin-types bla/blubb");
+    return promise_violation("object-src 'none'");
   }
   function flush() {
    expect_throws(_ => {
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers
index b5e94c400bb..d212eda5ef5 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers
@@ -1,4 +1,4 @@
 Content-Security-Policy: script-src http: https: 'nonce-123' 'unsafe-eval'
-Content-Security-Policy: plugin-types bla/blubb
+Content-Security-Policy: object-src 'none'
 Content-Security-Policy-Report-Only: require-trusted-types-for 'script'
 
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html
index 9621aaba974..73bb0113494 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html
@@ -10,7 +10,7 @@
   // headers are set in the .headers file:
   //
   //   Content-Security-Policy: script-src 'unsafe-inline' 'unsafe-eval'; report-uri ...
-  //   Content-Security-Policy: plugin-types bla/blubb
+  //   Content-Security-Policy: object-src 'none'
   //   Content-Security-Policy: require-trusted-types-for 'script'
   //
   // The last rule is there so we can provoke a CSP violation report at will.
@@ -55,7 +55,7 @@
   // Provoke/wait for a CSP violation, in order to be sure that all previous
   // CSP violations have been delivered.
   function promise_flush() {
-    return promise_violation("plugin-types bla/blubb");
+    return promise_violation("object-src 'none'");
   }
   function flush() {
    expect_throws(_ => {
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers
index 3f55bba7d1b..8989345e722 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers
@@ -1,4 +1,4 @@
 Content-Security-Policy: script-src http: https: 'nonce-123' 'unsafe-eval'
-Content-Security-Policy: plugin-types bla/blubb
+Content-Security-Policy: object-src 'none'
 Content-Security-Policy: require-trusted-types-for 'script'
 
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html
index 1e9d20d308f..9db307db60d 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html
@@ -13,13 +13,13 @@
   //
   //   Content-Security-Policy: trusted-types one
   //   Content-Security-Policy-Report-Only: trusted-types two; report-uri ...
-  //   Content-Security-Policy: plugin-types bla/blubb
+  //   Content-Security-Policy: object-src 'none'
   //   Content-Security-Policy: default-src * 'unsafe-inline'
   //
   // The third rule is there so we can provoke a CSP violation report at will.
   // The intent is that in order to test that a violation has *not* been thrown
   // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the plugin-types rule) and when that event is
+  // CSP violation (by violating the object-src rule) and when that event is
   // processed we can we sure that an earlier event - if it indeed occurred -
   // must have already been processed.
   //
@@ -84,7 +84,7 @@
   // Provoke/wait for a CSP violation, in order to be sure that all previous
   // CSP violations have been delivered.
   function promise_flush() {
-    return promise_violation("plugin-types bla/blubb");
+    return promise_violation("object-src 'none'");
   }
   function flush() {
    expect_throws(_ => {
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html.headers
index fa8aceab74b..31c8e413170 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html.headers
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html.headers
@@ -1,6 +1,6 @@
 Content-Security-Policy: trusted-types one
 Content-Security-Policy-Report-Only: trusted-types two; report-uri /content-security-policy/resources/dummy-report.php
-Content-Security-Policy: plugin-types bla/blubb
+Content-Security-Policy: object-src 'none'
 Content-Security-Policy: default-src * 'unsafe-inline'
 Content-Security-Policy: require-trusted-types-for 'script'
 
diff --git a/tests/wpt/web-platform-tests/url/url-constructor.any.js b/tests/wpt/web-platform-tests/url/url-constructor.any.js
index 153d985ff67..3f4af56d2a9 100644
--- a/tests/wpt/web-platform-tests/url/url-constructor.any.js
+++ b/tests/wpt/web-platform-tests/url/url-constructor.any.js
@@ -1,3 +1,5 @@
+// META: timeout=long
+
 function bURL(url, base) {
   return new URL(url, base || "about:blank")
 }