Update web-platform-tests to revision cf8340b5fae7b820788ffc31f8cc6b6b04978002

41 files changed, 270 insertions, 295 deletions

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 4d30afbe6ea..4ba9d85640f 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -3528,16 +3528,6 @@
         "url": "/2dcontext/the-canvas-state/canvas_state_restore_001.htm"
       },
       {
-        "path": "2dcontext/transformations/canvas_transformations_reset_001.htm",
-        "references": [
-          [
-            "/2dcontext/transformations/canvas_transformations_reset_001-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/2dcontext/transformations/canvas_transformations_reset_001.htm"
-      },
-      {
         "path": "2dcontext/transformations/canvas_transformations_reset_001.html",
         "references": [
           [
@@ -4228,6 +4218,46 @@
         "url": "/html/rendering/non-replaced-elements/flow-content-0/figure.html"
       },
       {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html"
+      },
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html"
+      },
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html"
+      },
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml"
+      },
+      {
         "path": "html/rendering/non-replaced-elements/tables/table-border-1.html",
         "references": [
           [
@@ -4838,96 +4868,6 @@
         "url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html"
       },
       {
-        "path": "quirks-mode/font-element-text-decoration-color/001-a.html",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-a.html"
-      },
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-q.html",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-q.html"
-      },
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-s.html",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-s.html"
-      },
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-x.xhtml",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-x.xhtml"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html"
-      },
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html"
-      },
-      {
         "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001.html",
         "references": [
           [
@@ -13184,6 +13124,10 @@
         "url": "/dom/nodes/CharacterData-substringData.html"
       },
       {
+        "path": "dom/nodes/CharacterData-surrogates.html",
+        "url": "/dom/nodes/CharacterData-surrogates.html"
+      },
+      {
         "path": "dom/nodes/ChildNode-after.html",
         "url": "/dom/nodes/ChildNode-after.html"
       },
@@ -14756,8 +14700,8 @@
         "url": "/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/Document.currentScript.html",
-        "url": "/html/dom/documents/dom-tree-accessors/Document.currentScript.html"
+        "path": "html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html",
+        "url": "/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html",
@@ -18068,6 +18012,10 @@
         "url": "/infrastructure/failing-test.html"
       },
       {
+        "path": "js/behaviours/SetPrototypeOf-window.html",
+        "url": "/js/behaviours/SetPrototypeOf-window.html"
+      },
+      {
         "path": "js/builtins/Array.DefineOwnProperty.html",
         "url": "/js/builtins/Array.DefineOwnProperty.html"
       },
@@ -24984,10 +24932,6 @@
         "url": "/selection/Document-open.html"
       },
       {
-        "path": "selection/addRange.html",
-        "url": "/selection/addRange.html"
-      },
-      {
         "path": "selection/collapse.html",
         "url": "/selection/collapse.html"
       },
@@ -28840,6 +28784,11 @@
         "url": "/quirks-mode/hashless-hex-color.html"
       },
       {
+        "path": "selection/addRange.html",
+        "timeout": "long",
+        "url": "/selection/addRange.html"
+      },
+      {
         "path": "service-workers/cache-storage/common.https.html",
         "timeout": "long",
         "url": "/service-workers/cache-storage/common.https.html"
@@ -29105,24 +29054,8 @@
     ]
   },
   "local_changes": {
-    "deleted": [
-      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html",
-      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html",
-      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html",
-      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html",
-      "2dcontext/transformations/canvas_transformations_reset_001.htm",
-      "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html"
-    ],
-    "items": {
-      "testharness": {
-        "dom/nodes/CharacterData-surrogates.html": [
-          {
-            "path": "dom/nodes/CharacterData-surrogates.html",
-            "url": "/dom/nodes/CharacterData-surrogates.html"
-          }
-        ]
-      }
-    },
+    "deleted": [],
+    "items": {},
     "reftest_nodes": {}
   },
   "reftest_nodes": {
@@ -29522,18 +29455,6 @@
         "url": "/2dcontext/the-canvas-state/canvas_state_restore_001.htm"
       }
     ],
-    "2dcontext/transformations/canvas_transformations_reset_001.htm": [
-      {
-        "path": "2dcontext/transformations/canvas_transformations_reset_001.htm",
-        "references": [
-          [
-            "/2dcontext/transformations/canvas_transformations_reset_001-ref.htm",
-            "=="
-          ]
-        ],
-        "url": "/2dcontext/transformations/canvas_transformations_reset_001.htm"
-      }
-    ],
     "2dcontext/transformations/canvas_transformations_reset_001.html": [
       {
         "path": "2dcontext/transformations/canvas_transformations_reset_001.html",
@@ -30878,6 +30799,54 @@
         "url": "/html/rendering/non-replaced-elements/flow-content-0/figure.html"
       }
     ],
+    "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html": [
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html"
+      }
+    ],
+    "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html": [
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html"
+      }
+    ],
+    "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html": [
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html"
+      }
+    ],
+    "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml": [
+      {
+        "path": "html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml"
+      }
+    ],
     "html/rendering/non-replaced-elements/tables/table-border-1.html": [
       {
         "path": "html/rendering/non-replaced-elements/tables/table-border-1.html",
@@ -31730,114 +31699,6 @@
         "url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html"
       }
     ],
-    "quirks-mode/font-element-text-decoration-color/001-a.html": [
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-a.html",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-a.html"
-      }
-    ],
-    "quirks-mode/font-element-text-decoration-color/001-q.html": [
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-q.html",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-q.html"
-      }
-    ],
-    "quirks-mode/font-element-text-decoration-color/001-s.html": [
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-s.html",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-s.html"
-      }
-    ],
-    "quirks-mode/font-element-text-decoration-color/001-x.xhtml": [
-      {
-        "path": "quirks-mode/font-element-text-decoration-color/001-x.xhtml",
-        "references": [
-          [
-            "/quirks-mode/font-element-text-decoration-color/001-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/quirks-mode/font-element-text-decoration-color/001-x.xhtml"
-      }
-    ],
-    "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html": [
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html"
-      }
-    ],
-    "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html": [
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html"
-      }
-    ],
-    "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html": [
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html"
-      }
-    ],
-    "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html": [
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html"
-      }
-    ],
-    "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html": [
-      {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html",
-        "references": [
-          [
-            "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html"
-      }
-    ],
     "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001.html": [
       {
         "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001.html",
@@ -34599,7 +34460,7 @@
       }
     ]
   },
-  "rev": "acd60f9e55532f03fc905e61591b7fd7db2f08d1",
+  "rev": "cf8340b5fae7b820788ffc31f8cc6b6b04978002",
   "url_base": "/",
   "version": 2
 }
\ No newline at end of file
diff --git a/tests/wpt/metadata/XMLHttpRequest/preserve-ua-header-on-redirect.htm.ini b/tests/wpt/metadata/XMLHttpRequest/preserve-ua-header-on-redirect.htm.ini
new file mode 100644
index 00000000000..468b61c3512
--- /dev/null
+++ b/tests/wpt/metadata/XMLHttpRequest/preserve-ua-header-on-redirect.htm.ini
@@ -0,0 +1,5 @@
+[preserve-ua-header-on-redirect.htm]
+  type: testharness
+  [XMLHttpRequest: User-Agent header is preserved on redirect 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini b/tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini
new file mode 100644
index 00000000000..04d3654a455
--- /dev/null
+++ b/tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini
@@ -0,0 +1,5 @@
+[setrequestheader-header-allowed.htm]
+  type: testharness
+  [XMLHttpRequest: setRequestHeader() - headers that are allowed (User-Agent)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/window-properties.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/window-properties.html.ini
index e2a63b29756..68049100081 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/window-properties.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/window-properties.html.ini
@@ -377,3 +377,4 @@
 
   [Window replaceable attribute: devicePixelRatio]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.html.ini b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.html.ini
deleted file mode 100644
index 12b57e32997..00000000000
--- a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Document.currentScript.html]
-  type: testharness
-  expected: TIMEOUT
-  [Script script-window-error]
-    expected: FAIL
-
-  [Script script-svg]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini
new file mode 100644
index 00000000000..aa73a1bc576
--- /dev/null
+++ b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini
@@ -0,0 +1,18 @@
+[Document.currentScript.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Script script-window-error]
+    expected: FAIL
+
+  [Script script-svg]
+    expected: NOTRUN
+
+  [Script iframe-src]
+    expected: NOTRUN
+
+  [Script cross-origin]
+    expected: NOTRUN
+
+  [Script document-write]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini
index ba0fe7f1161..a1e22155c9c 100644
--- a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini
+++ b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini
@@ -1,8 +1,5 @@
 [document.forms.html]
   type: testharness
-  [document.forms]
-    expected: FAIL
-
   [document.forms iteration]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html.ini
new file mode 100644
index 00000000000..4ab40584c66
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html.ini
@@ -0,0 +1,3 @@
+[001-a.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html.ini
new file mode 100644
index 00000000000..649e95c47ba
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html.ini
@@ -0,0 +1,3 @@
+[001-q.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html.ini
new file mode 100644
index 00000000000..f6fe434b3aa
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html.ini
@@ -0,0 +1,3 @@
+[001-s.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml.ini
new file mode 100644
index 00000000000..55ede6bf25d
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml.ini
@@ -0,0 +1,3 @@
+[001-x.xhtml]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata/mozilla-sync b/tests/wpt/metadata/mozilla-sync
index 8c24692863c..9a6ec174823 100644
--- a/tests/wpt/metadata/mozilla-sync
+++ b/tests/wpt/metadata/mozilla-sync
@@ -1 +1 @@
-a1cd27e6a3b961129fd4710513cc29e4f7c9cc67
\ No newline at end of file
+dbf549ea32d23cf96b7f49e3333c068aaf050bc3
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm b/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm
index 4d515a1b920..074934aefd7 100644
--- a/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm
+++ b/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm
@@ -22,6 +22,22 @@
         client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_name=user-agent"))
         client.send(null)
       })
+
+      var test2 = async_test()
+      test2.step(function() {
+        var client = new XMLHttpRequest()
+          client.onreadystatechange = function() {
+            test2.step(function() {
+              if(client.readyState == 4) {
+                assert_equals(client.responseText, 'user-agent: TEST\n')
+                test2.done()
+              }
+            })
+          }
+        client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_name=user-agent"))
+        client.setRequestHeader("User-Agent", "TEST")
+        client.send(null)
+      })
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm
index a6e0eabd89a..df7d94a933d 100644
--- a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm
+++ b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm
@@ -21,6 +21,7 @@
       }
       request("Authorization")
       request("Pragma")
+      request("User-Agent")
       request("Content-Transfer-Encoding")
       request("Content-Type")
       request("Overwrite")
diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm
index 00c0e7f75a8..b6873216fd9 100644
--- a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm
+++ b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() - headers that are forbidden</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[5]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[5]" />
 
   </head>
   <body>
@@ -29,7 +29,6 @@
         client.setRequestHeader("Trailer", "TEST")
         client.setRequestHeader("Transfer-Encoding", "TEST")
         client.setRequestHeader("Upgrade", "TEST")
-        client.setRequestHeader("User-Agent", "TEST")
         client.setRequestHeader("Via", "TEST")
         client.setRequestHeader("Proxy-", "TEST")
         client.setRequestHeader("Proxy-Authorization", "TEST")
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html
index 6bacdc36e5b..a7a217448a0 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html
@@ -11,7 +11,7 @@
 
     </script>
     <!-- enforcing policy:
-script-src 'self' 'sha256-IFmozo9WnnsMXVl_Ka8XzJ3Nd8yzS2zA2ME0mwtd-Ck=' 'sha256-jSpTmJKcrnHttKdYM_wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn_UmK7v_K77t-fvfxA89QT_K9qPNyE=' 'sha256-K-7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; connect-src 'self';
+script-src 'self' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self';
 -->
     <script>
         alert_assert('PASS (1/4)');
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers
index 8eaf327858a..e0fe373b628 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: scripthash-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-IFmozo9WnnsMXVl_Ka8XzJ3Nd8yzS2zA2ME0mwtd-Ck=' 'sha256-jSpTmJKcrnHttKdYM_wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn_UmK7v_K77t-fvfxA89QT_K9qPNyE=' 'sha256-K-7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
index cbf955b10d8..14582670b22 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
@@ -11,7 +11,7 @@
 
     </script>
     <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'sha256-xy4iRAvdlFCq-M5-4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self';
+script-src 'self' 'unsafe-inline' 'sha256-xy4iRAvdlFCq+M5+4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self';
 -->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <!-- The following two scripts contain two separate code points (U+00C5
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
index 065234dd7f1..6281a262386 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: scripthash-unicode-normalization={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-xy4iRAvdlFCq-M5-4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'sha256-xy4iRAvdlFCq+M5+4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html
deleted file mode 100644
index a8d4af4a569..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html
+++ /dev/null
@@ -1 +0,0 @@
-<iframe src="/common/redirect.py?location=http://{{host}}:{{ports[http][0]}}/security/contentSecurityPolicy/resources/alert-fail.html"></iframe>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html.sub.headers
deleted file mode 100644
index 43a16c21826..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: frame-src-redirect-blocked={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: frame-src 127.0.0.1:8000; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html
index 5594a761551..8ec6fe43303 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html
@@ -9,8 +9,8 @@
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["Pass 1 of 2","Pass 2 of 2"]'></script>
     <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' http://127.0.0.1:* 'unsafe-inline'; connect-src 'self';
--->
+      script-src 'self' 'unsafe-inline'; connect-src 'self';
+    -->
 </head>
 
 <body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers
index 80315fb217f..7f345392489 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: injected-inline-script-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' http://127.0.0.1:* 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html
index 6e910e5eab2..bee3f9abd54 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html
@@ -14,7 +14,7 @@ script-src 'self'; connect-src 'self';
 <body>
     <script src="resources/inject-script.js"></script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20http://127.0.0.1:*"></script>
+    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20'self'"></script>
 </body>
 
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html
deleted file mode 100644
index c6aba864d68..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-    // This script block will trigger a violation report.
-    alert_assert('FAIL');
-
-</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html.sub.headers
deleted file mode 100644
index d000f87ec5c..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: report-uri-scheme-relative={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' 'self'; report-uri //127.0.0.1:8080/security/contentSecurityPolicy/resources/save-report.php?test=report-uri-scheme-relative.html; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.js
deleted file mode 100644
index 40d2127b559..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.js
+++ /dev/null
@@ -1 +0,0 @@
-alert_assert('FAIL');
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js
index f646027f5c4..15537198507 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js
@@ -1,5 +1,5 @@
 document.write("<script>alert_assert('Pass 1 of 2');</script>");
 
 var s = document.createElement('script');
-s.innerText = "alert_assert('Pass 2 of 2');";
+s.textContent = "alert_assert('Pass 2 of 2');";
 document.body.appendChild(s);
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-style.js b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-style.js
index 219d8f559c5..532645a455f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-style.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-style.js
@@ -1,5 +1,5 @@
 document.write("<style>#test1 { display: none; }</style>");
 
 var s = document.createElement('style');
-s.innerText = "#test2 { display: none; }";
+s.textContent = "#test2 { display: none; }";
 document.body.appendChild(s);
diff --git a/tests/wpt/web-platform-tests/docs/css-naming.md b/tests/wpt/web-platform-tests/docs/css-naming.md
index 8fd8c4ccfbe..c508ac33fdd 100644
--- a/tests/wpt/web-platform-tests/docs/css-naming.md
+++ b/tests/wpt/web-platform-tests/docs/css-naming.md
@@ -8,6 +8,15 @@ somewhat describes the test, `###` is a zero-filled number used to
 keep the file names unique, and `ext` is typically either
 `html` or `xht`.
 
+Test filenames must also be globally unique. There cannot be multiple
+tests with the same filename, even if they are in different parent
+directories. For example, having both
+`/css-values-3/foo-001.html` and `/css-variables-1/foo-001.html`
+would not be allowed. This restriction is in place because some tools
+that use the CSS tests dump all of the test files into a single
+directory, which would cause all but one of the tests with the same
+filename to be clobbered and accidentally skipped.
+
 ### test-topic
 
 `test-topic` is a short identifier that describes the test. The
diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.html b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html
index 599c6d21483..c523bfb0ac3 100644
--- a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.html
+++ b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html
@@ -21,7 +21,11 @@ var data = {
   "xhr-test" : [],
   "script-svg" : [],
   "script-async" : [],
-  "script-defer" : []
+  "script-defer" : [],
+  "script-async-false" : [],
+  "iframe-src" : [],
+  "cross-origin" : [null],
+  "document-write" : []
 };
 
 var expected = {};
@@ -189,3 +193,38 @@ function testLoadFail() {
 <script id='script-async' async src='data:text/plain,verify("script-async"),finish("script-async")'></script>
 
 <script id='script-defer' defer src='data:text/plain,verify("script-defer"),finish("script-defer")'></script>
+
+<!-- Test async = false dynamic script loading -->
+<script>
+  var s = document.createElement("script");
+  s.id = "script-async-false";
+  s.src = "data:text/plain,verify('script-async-false');"
+  s.onload = function() {
+    finish('script-async-false');
+  }
+  s.async = false;
+  document.body.appendChild(s);
+</script>
+
+<!-- Verify in iframe javascript uri scheme -->
+<iframe src="javascript:parent.verify('iframe-src'),parent.finish('iframe-src')"
+        style="visibility:hidden;display:none">
+</iframe>
+
+<!-- Testing cross origin script -->
+<script>
+var s = document.createElement("script");
+s.id = "cross-origin";
+s.src = "http://{{domains[www1]}}:{{ports[http][1]}}/html/dom/documents/dom-tree-accessors/cross-domain.js"
+s.onload = function() {
+  verify('cross-origin')
+  finish('cross-origin');
+}
+document.body.appendChild(s);
+
+</script>
+
+<!-- Testing document.write -->
+<script>
+document.write('<script id="document-write">verify("document-write"); finish("document-write");</' + 'script>');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/cross-domain.js b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/cross-domain.js
new file mode 100644
index 00000000000..32effe3c458
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/cross-domain.js
@@ -0,0 +1 @@
+//test script to check cross-domain script execution as in Document.currentScript.sub.html
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.forms.html b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.forms.html
index d6ca1be3826..32f35f13b79 100644
--- a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.forms.html
+++ b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.forms.html
@@ -34,11 +34,16 @@ test(function() {
   assert_equals(document.forms.item(1).id, "form2");
   assert_equals(document.forms.namedItem("form1").id, "form1");
   assert_equals(document.forms.namedItem("form2").id, "form2");
-  assert_equals(document.forms.item("form1").id, "form1");
-  assert_equals(document.forms.item("form2").id, "form2");
 }, "document.forms")
 
 test(function() {
+  // The `item` method takes one *numeric* argument. Passing a string to `item`
+  // results in that string getting converted to 0
+  assert_equals(document.forms.item("form1").id, "form1");
+  assert_equals(document.forms.item("form2").id, "form1");
+}, "document.forms.item with string arg")
+
+test(function() {
   assert_equals(document.forms[""], undefined);
   assert_equals(document.forms.namedItem(""), null);
 }, "document.forms with empty string")
diff --git a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-a.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html
index c8ed1903fd8..c8ed1903fd8 100644
--- a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-a.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html
diff --git a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-q.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html
index 9025e728991..9025e728991 100644
--- a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-q.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html
diff --git a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-ref.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html
index a6fec366db2..a6fec366db2 100644
--- a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-ref.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html
diff --git a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-s.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html
index bac80e53bae..bac80e53bae 100644
--- a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-s.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html
diff --git a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-x.xhtml b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml
index 7a5090c366b..7a5090c366b 100644
--- a/tests/wpt/web-platform-tests/quirks-mode/font-element-text-decoration-color/001-x.xhtml
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml
diff --git a/tests/wpt/web-platform-tests/js/behaviours/SetPrototypeOf-window.html b/tests/wpt/web-platform-tests/js/behaviours/SetPrototypeOf-window.html
new file mode 100644
index 00000000000..0a6ec249fa3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/behaviours/SetPrototypeOf-window.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for [[SetPrototypeOf]] with Windows</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  assert_throws(new TypeError, function() {
+    Object.setPrototypeOf(window, window);
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to itself via setPrototypeOf");
+
+test(function() {
+  assert_throws(new TypeError, function() {
+    window.__proto__ = window;
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to itself via __proto__");
+
+test(function() {
+  assert_throws(new TypeError, function() {
+    Object.setPrototypeOf(window, Object.create(window));
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to something that has the window on " +
+   "its proto chain via setPrototypeOf");
+
+test(function() {
+  assert_throws(new TypeError, function() {
+    window.__proto__ = Object.create(window);
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to something that has the window on " +
+   "its proto chain via __proto__");
+</script>
diff --git a/tests/wpt/web-platform-tests/notifications/tag-same-manual.html b/tests/wpt/web-platform-tests/notifications/tag-same-manual.html
index 53ebfd35ce5..4454944c535 100644
--- a/tests/wpt/web-platform-tests/notifications/tag-same-manual.html
+++ b/tests/wpt/web-platform-tests/notifications/tag-same-manual.html
@@ -17,9 +17,9 @@ if (hasNotificationPermission()) {
                 notifications = [],
                 text1 = "This is the body: Room 101",
                 text2 = "This is the body: Room 202"
-            createPassFail("If two notifications appear: First one with the"
-                + " text \"" + text1 + "\", followed by one with the text \""
-                + text2 + "\"",
+            createPassFail("If a notification with the text \""
+                + text2 + "\", replaces the notification with the text \""
+                + text1 + "\" in the same position",
                 t, closeNotifications, notifications)
             notification1 = new Notification("New Email Received", {
                 body: text1,
diff --git a/tests/wpt/web-platform-tests/selection/addRange.html b/tests/wpt/web-platform-tests/selection/addRange.html
index 2d841ce4c37..5fe8409427b 100644
--- a/tests/wpt/web-platform-tests/selection/addRange.html
+++ b/tests/wpt/web-platform-tests/selection/addRange.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <title>Selection.addRange() tests</title>
 <div id=log></div>
+<meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=common.js></script>