Backed out 3 changesets (bug 1217418, bug 1217767) for Linux x64 debug W-e10s(3) permafail. r=nigelb,backout

Backed out changeset af7f10137637 (bug 1217767)
Backed out changeset f65121860ffe (bug 1217418)
Backed out changeset c050501bde82 (bug 1217767)

--HG--
rename : testing/web-platform/tests/webstorage/storage_supported_property_names.html => testing/web-platform/tests/dom/collections/storage-supported-property-names.html

testing/web-platform/meta/MANIFEST.json

@@ -13281,6 +13281,10 @@
         "path": "dom/collections/HTMLCollection-supported-property-names.html",
         "url": "/dom/collections/HTMLCollection-supported-property-names.html"
       },
+      {
+        "path": "dom/collections/storage-supported-property-names.html",
+        "url": "/dom/collections/storage-supported-property-names.html"
+      },
       {
         "path": "dom/events/Event-constants.html",
         "url": "/dom/events/Event-constants.html"
@@ -13705,10 +13709,6 @@
         "path": "dom/nodes/Element-getElementsByClassName.html",
         "url": "/dom/nodes/Element-getElementsByClassName.html"
       },
-      {
-        "path": "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html",
-        "url": "/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html"
-      },
       {
         "path": "dom/nodes/Element-getElementsByTagName.html",
         "url": "/dom/nodes/Element-getElementsByTagName.html"
@@ -13837,10 +13837,6 @@
         "path": "dom/nodes/Node-contains.html",
         "url": "/dom/nodes/Node-contains.html"
       },
-      {
-        "path": "dom/nodes/Node-contains.xml",
-        "url": "/dom/nodes/Node-contains.xml"
-      },
       {
         "path": "dom/nodes/Node-insertBefore.html",
         "url": "/dom/nodes/Node-insertBefore.html"
@@ -13977,14 +13973,6 @@
         "path": "dom/nodes/getElementsByClassName-09.htm",
         "url": "/dom/nodes/getElementsByClassName-09.htm"
       },
-      {
-        "path": "dom/nodes/getElementsByClassName-10.xml",
-        "url": "/dom/nodes/getElementsByClassName-10.xml"
-      },
-      {
-        "path": "dom/nodes/getElementsByClassName-11.xml",
-        "url": "/dom/nodes/getElementsByClassName-11.xml"
-      },
       {
         "path": "dom/nodes/getElementsByClassName-12.htm",
         "url": "/dom/nodes/getElementsByClassName-12.htm"
@@ -26145,6 +26133,10 @@
         "path": "shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html",
         "url": "/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html"
       },
+      {
+        "path": "subresource-integrity/subresource-integrity.html",
+        "url": "/subresource-integrity/subresource-integrity.html"
+      },
       {
         "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
@@ -27613,10 +27605,6 @@
         "path": "webstorage/storage_string_conversion.html",
         "url": "/webstorage/storage_string_conversion.html"
       },
-      {
-        "path": "webstorage/storage_supported_property_names.html",
-        "url": "/webstorage/storage_supported_property_names.html"
-      },
       {
         "path": "webvtt/interfaces.html",
         "url": "/webvtt/interfaces.html"
@@ -29794,7 +29782,16 @@
   },
   "local_changes": {
     "deleted": [],
-    "items": {},
+    "items": {
+      "testharness": {
+        "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html": [
+          {
+            "path": "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html",
+            "url": "/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html"
+          }
+        ]
+      }
+    },
     "reftest_nodes": {}
   },
   "reftest_nodes": {
@@ -31526,18 +31523,6 @@
         "url": "/html/rendering/bindings/the-textarea-element-0/rows-zero.html"
       }
     ],
-    "html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html": [
-      {
-        "path": "html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html",
-        "references": [
-          [
-            "/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html",
-            "=="
-          ]
-        ],
-        "url": "/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html"
-      }
-    ],
     "html/rendering/non-replaced-elements/flow-content-0/figure.html": [
       {
         "path": "html/rendering/non-replaced-elements/flow-content-0/figure.html",
@@ -35331,7 +35316,7 @@
       }
     ]
   },
-  "rev": "9a49a8ea7405280364a8aa27d47bfb19af119bb4",
+  "rev": "886dea2c3dbb79925360319a6a0f662ce196ab3c",
   "url_base": "/",
   "version": 2
 }

testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini

@@ -2,4 +2,3 @@
   type: testharness
   [Expecting alerts: ["xhr blocked","TEST COMPLETE"\]]
     expected: FAIL
-

testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini

@@ -2,4 +2,3 @@
   type: testharness
   [Expecting alerts: ["xhr blocked","TEST COMPLETE"\]]
     expected: FAIL
-

testing/web-platform/meta/dom/nodes/Document-createElement-namespace.html.ini

@@ -1,74 +0,0 @@
-[Document-createElement-namespace.html]
-  type: testharness
-  [Created element's namespace in created XML document]
-    expected: FAIL
-
-  [Created element's namespace in created XHTML document]
-    expected: FAIL
-
-  [Created element's namespace in created SVG document]
-    expected: FAIL
-
-  [Created element's namespace in created MathML document]
-    expected: FAIL
-
-  [Created element's namespace in empty.xml]
-    expected: FAIL
-
-  [Created element's namespace in empty.svg]
-    expected: FAIL
-
-  [Created element's namespace in minimal_html.xml]
-    expected: FAIL
-
-  [Created element's namespace in minimal_html.svg]
-    expected: FAIL
-
-  [Created element's namespace in xhtml.xml]
-    expected: FAIL
-
-  [Created element's namespace in xhtml.svg]
-    expected: FAIL
-
-  [Created element's namespace in svg.xml]
-    expected: FAIL
-
-  [Created element's namespace in svg.svg]
-    expected: FAIL
-
-  [Created element's namespace in mathml.xml]
-    expected: FAIL
-
-  [Created element's namespace in mathml.svg]
-    expected: FAIL
-
-  [Created element's namespace in bare_xhtml.xml]
-    expected: FAIL
-
-  [Created element's namespace in bare_xhtml.svg]
-    expected: FAIL
-
-  [Created element's namespace in bare_svg.xml]
-    expected: FAIL
-
-  [Created element's namespace in bare_svg.svg]
-    expected: FAIL
-
-  [Created element's namespace in bare_mathml.xml]
-    expected: FAIL
-
-  [Created element's namespace in bare_mathml.svg]
-    expected: FAIL
-
-  [Created element's namespace in xhtml_ns_removed.xml]
-    expected: FAIL
-
-  [Created element's namespace in xhtml_ns_removed.svg]
-    expected: FAIL
-
-  [Created element's namespace in xhtml_ns_changed.xml]
-    expected: FAIL
-
-  [Created element's namespace in xhtml_ns_changed.svg]
-    expected: FAIL
-

testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini

@@ -39,9 +39,3 @@
   [For document, xhtml namespace is default]
     expected: FAIL
 
-  [Document should have xhtml namespace, prefix null]
-    expected: FAIL
-
-  [Document should have xhtml namespace, prefix ""]
-    expected: FAIL
-

testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html.ini

@@ -1,7 +1,7 @@
 [browsing_context_name.html]
   type: testharness
   disabled:
-    if (os == "linux") and debug and (bits == 32): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if os == "linux" and debug and bits == 32: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Retaining window.name on history traversal]
     expected: FAIL
 

testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/008.html.ini

@@ -1,4 +1,4 @@
 [008.html]
   type: testharness
   disabled:
-    if (os == "linux") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if os == "linux" and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461

testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/009.html.ini

@@ -1,4 +1,4 @@
 [009.html]
   type: testharness
   disabled:
-    if (os == "linux") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if os == "linux" and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461

testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini

@@ -1,5 +1,6 @@
 [traverse_the_history_4.html]
   type: testharness
   [Multiple history traversals, last would be aborted]
-    expected: FAIL
+    expected:
+      FAIL
 

testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html.ini

@@ -1,7 +1,7 @@
 [traverse_the_history_write_after_load_1.html]
   type: testharness
   disabled:
-    if (os == "linux") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if os == "linux" and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Traverse the history after document.write after the load event]
     expected:
       if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini

@@ -1,7 +1,7 @@
 [traverse_the_history_write_onload_1.html]
   type: testharness
   disabled:
-    if debug or ((os == "linux") and (bits == 64)): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if debug or (os == "linux" and  bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Traverse the history when a history entry is written in the load event]
     expected:
       if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL

testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html.ini

@@ -1,7 +1,7 @@
 [traverse_the_history_write_onload_2.html]
   type: testharness
   disabled:
-    if debug or ((os == "linux") and (bits == 64)): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if debug or (os == "linux" and  bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Traverse the history back and forward when a history entry is written in the load event]
     expected:
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini

@@ -1,7 +1,7 @@
 [creating_browsing_context_test_01.html]
   type: testharness
   disabled:
-    if ((os == "linux") and (bits == 64)) or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if (os == "linux" and bits == 64) or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   expected:
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT

testing/web-platform/meta/html/browsers/windows/browsing-context-names/002.html.ini

@@ -1,7 +1,7 @@
 [002.html]
   type: testharness
   disabled:
-    if debug or (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if debug or os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Link with target=_blank, no rel]
     expected:
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html.ini

@@ -1,7 +1,5 @@
 [010.html]
   type: testharness
   [Salvagability of document.opened document]
-    expected:
+    expected: FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
-      FAIL
 

testing/web-platform/meta/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html.ini

@@ -9,3 +9,6 @@
   [The HTMLFormControlsCollection interface is used for collections of listed elements in fieldset element]
     expected: FAIL
 
+  [The controls in the form element must be sorted in tree order]
+    expected: FAIL
+

testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini

@@ -10,3 +10,4 @@
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
+

testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini

@@ -10,3 +10,4 @@
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
+

testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini

@@ -11,3 +11,4 @@
       if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
+

testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini

@@ -10,3 +10,4 @@
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
+

testing/web-platform/meta/mozilla-sync

@@ -1 +1 @@
-b6870b8795b5688a994267dfa50b4558218061d9
+0b6a123899da549977c73b35cf42d69daa94d823

testing/web-platform/meta/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html.ini

@@ -2580,33 +2580,3 @@
   [In-document.query: Syntax, group of selectors separator, no whitespace (1) (with no refNodes): #group em,#group strong]
     expected: FAIL
 
-  [In-document.queryAll: Class selector, matching element with class value using non-ASCII characters (2) (with no refNodes): .台北Táiběi]
-    expected: FAIL
-
-  [In-document.query: Class selector, matching element with class value using non-ASCII characters (2) (with no refNodes): .台北Táiběi]
-    expected: FAIL
-
-  [In-document.queryAll: Class selector, chained, matching element with multiple class values using non-ASCII characters (2) (with no refNodes): .台北Táiběi.台北]
-    expected: FAIL
-
-  [In-document.query: Class selector, chained, matching element with multiple class values using non-ASCII characters (2) (with no refNodes): .台北Táiběi.台北]
-    expected: FAIL
-
-  [In-document.queryAll: ID selector, matching id value using non-ASCII characters (3) (with no refNodes): #台北Táiběi]
-    expected: FAIL
-
-  [In-document.query: ID selector, matching id value using non-ASCII characters (3) (with no refNodes): #台北Táiběi]
-    expected: FAIL
-
-  [In-document.queryAll: ID selector, matching id value using non-ASCII characters (4) (with no refNodes): #台北]
-    expected: FAIL
-
-  [In-document.query: ID selector, matching id value using non-ASCII characters (4) (with no refNodes): #台北]
-    expected: FAIL
-
-  [In-document.queryAll: ID selector, matching id values using non-ASCII characters (2) (with no refNodes): #台北Táiběi, #台北]
-    expected: FAIL
-
-  [In-document.query: ID selector, matching id values using non-ASCII characters (2) (with no refNodes): #台北Táiběi, #台北]
-    expected: FAIL
-

testing/web-platform/meta/websockets/interfaces/WebSocket/close/close-multiple.html.ini

@@ -1,4 +1,4 @@
 [close-multiple.html]
   type: testharness
   disabled:
-    if e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1205672
+    if debug and e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1205672

testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini

@@ -1,3 +1,4 @@
 [white-space_pre.html]
   type: reftest
-  expected: FAIL
+  expected:
+    FAIL

testing/web-platform/meta/workers/interfaces/WorkerUtils/importScripts/004.html.ini

@@ -2,4 +2,3 @@
   type: testharness
   [importScripts broken script]
     expected: FAIL
-

testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html

@@ -13,17 +13,22 @@
  */
 
 /**
- * Test that an element created using the Document object doc has the HTML
+ * Test that an element created using the Document object doc has the namespace
- * namespace.
+ * that would be expected for the given contentType.
  */
 function testDoc(doc, contentType) {
+  // WebKit doesn't support document.contentType, so they don't get this sanity
+  // check :(
   if (doc.contentType !== undefined) {
-    // Sanity check
     assert_equals(doc.contentType, contentType,
                   "Wrong MIME type -- incorrect server config?");
   }
 
-  assert_equals(doc.createElement("x").namespaceURI, "http://www.w3.org/1999/xhtml");
+  var expectedNamespace = contentType == "text/html" ||
+                          contentType == "application/xhtml+xml"
+                          ? "http://www.w3.org/1999/xhtml" : null;
+
+  assert_equals(doc.createElement("x").namespaceURI, expectedNamespace);
 }
 
 // First test various objects we create in JS

testing/web-platform/tests/dom/nodes/Node-lookupNamespaceURI.html

@@ -23,40 +23,43 @@ function isDefaultNamespace(node, namespace, expected, name) {
 
 
 var frag = document.createDocumentFragment();
-lookupNamespaceURI(frag, null, null, 'DocumentFragment should have null namespace, prefix null');
+lookupNamespaceURI(frag, null, null, 'DocumentFragment should have null namespace');
-lookupNamespaceURI(frag, '', null, 'DocumentFragment should have null namespace, prefix ""');
+lookupNamespaceURI(frag, '', null, 'DocumentFragment should have null namespace');
-lookupNamespaceURI(frag, 'foo', null, 'DocumentFragment should have null namespace, prefix "foo"');
+lookupNamespaceURI(frag, 'foo', null, 'DocumentFragment should have null namespace');
-lookupNamespaceURI(frag, 'xmlns', null, 'DocumentFragment should have null namespace, prefix "xmlns"');
+lookupNamespaceURI(frag, 'xmlns', null, 'DocumentFragment should have null namespace');
-isDefaultNamespace(frag, null, true, 'DocumentFragment is in default namespace, prefix null');
+isDefaultNamespace(frag, null, true, 'DocumentFragment is in default namespace');
-isDefaultNamespace(frag, '', true, 'DocumentFragment is in default namespace, prefix ""');
+isDefaultNamespace(frag, '', true, 'DocumentFragment is in default namespace');
-isDefaultNamespace(frag, 'foo', false, 'DocumentFragment is in default namespace, prefix "foo"');
+isDefaultNamespace(frag, 'foo', false, 'DocumentFragment is in default namespace');
-isDefaultNamespace(frag, 'xmlns', false, 'DocumentFragment is in default namespace, prefix "xmlns"');
+isDefaultNamespace(frag, 'xmlns', false, 'DocumentFragment is in default namespace');
 
 
 
 var fooElem = document.createElementNS('fooNamespace', 'prefix:elem');
 fooElem.setAttribute('bar', 'value');
 
-lookupNamespaceURI(fooElem, null, null, 'Element should have null namespace, prefix null');
+lookupNamespaceURI(fooElem, null, null, 'Element should have null namespace');
-lookupNamespaceURI(fooElem, '', null, 'Element should have null namespace, prefix ""');
+lookupNamespaceURI(fooElem, '', null, 'Element should have null namespace');
 lookupNamespaceURI(fooElem, 'fooNamespace', null, 'Element should not have namespace matching prefix with namespaceURI value');
 lookupNamespaceURI(fooElem, 'xmlns', null, 'Element should not have XMLNS namespace');
 lookupNamespaceURI(fooElem, 'prefix', 'fooNamespace', 'Element has namespace URI matching prefix');
-isDefaultNamespace(fooElem, null, true, 'Empty namespace is not default, prefix null');
+isDefaultNamespace(fooElem, null, true, 'Empty namespace is not default');
-isDefaultNamespace(fooElem, '', true, 'Empty namespace is not default, prefix ""');
+isDefaultNamespace(fooElem, '', true, 'Empty namespace is not default');
 isDefaultNamespace(fooElem, 'fooNamespace', false, 'fooNamespace is not default');
 isDefaultNamespace(fooElem, 'http://www.w3.org/2000/xmlns/', false, 'xmlns namespace is not default');
 
 fooElem.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:bar', 'barURI');
 fooElem.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns', 'bazURI');
 
-lookupNamespaceURI(fooElem, null, 'bazURI', 'Element should have baz namespace, prefix null');
+lookupNamespaceURI(fooElem, null, 'bazURI', 'Element should have baz namespace');
-lookupNamespaceURI(fooElem, '', 'bazURI', 'Element should have baz namespace, prefix ""');
+lookupNamespaceURI(fooElem, '', 'bazURI', 'Element should have baz namespace');
+lookupNamespaceURI(fooElem, 'prefix', 'fooNamespace', 'Element has namespace URI matching prefix');
 lookupNamespaceURI(fooElem, 'xmlns', null, 'Element does not has namespace with xlmns prefix');
 lookupNamespaceURI(fooElem, 'bar', 'barURI', 'Element has bar namespace');
 
-isDefaultNamespace(fooElem, null, false, 'Empty namespace is not default on fooElem, prefix null');
+isDefaultNamespace(fooElem, null, false, 'Empty namespace is not default');
-isDefaultNamespace(fooElem, '', false, 'Empty namespace is not default on fooElem, prefix ""');
+isDefaultNamespace(fooElem, '', false, 'Empty namespace is not default');
+isDefaultNamespace(fooElem, 'fooNamespace', false, 'fooNamespace is not default');
+isDefaultNamespace(fooElem, 'http://www.w3.org/2000/xmlns/', false, 'xmlns namespace is not default');
 isDefaultNamespace(fooElem, 'barURI', false, 'bar namespace is not default');
 isDefaultNamespace(fooElem, 'bazURI', true, 'baz namespace is default');
 
@@ -68,8 +71,8 @@ lookupNamespaceURI(comment, '', 'bazURI', 'Comment should inherit  baz namespace
 lookupNamespaceURI(comment, 'prefix', 'fooNamespace', 'Comment should inherit namespace URI matching prefix');
 lookupNamespaceURI(comment, 'bar', 'barURI', 'Comment should inherit bar namespace');
 
-isDefaultNamespace(comment, null, false, 'For comment, empty namespace is not default, prefix null');
+isDefaultNamespace(comment, null, false, 'For comment, empty namespace is not default');
-isDefaultNamespace(comment, '', false, 'For comment, empty namespace is not default, prefix ""');
+isDefaultNamespace(comment, '', false, 'For comment, empty namespace is not default');
 isDefaultNamespace(comment, 'fooNamespace', false, 'For comment, fooNamespace is not default');
 isDefaultNamespace(comment, 'http://www.w3.org/2000/xmlns/', false, 'For comment, xmlns namespace is not default');
 isDefaultNamespace(comment, 'barURI', false, 'For comment, inherited bar namespace is not default');
@@ -83,8 +86,8 @@ lookupNamespaceURI(fooChild, '', 'childNamespace', 'Child element should have nu
 lookupNamespaceURI(fooChild, 'xmlns', null, 'Child element should not have XMLNS namespace');
 lookupNamespaceURI(fooChild, 'prefix', 'fooNamespace', 'Child element has namespace URI matching prefix');
 
-isDefaultNamespace(fooChild, null, false, 'Empty namespace is not default for child, prefix null');
+isDefaultNamespace(fooChild, null, false, 'Empty namespace is not default for child');
-isDefaultNamespace(fooChild, '', false, 'Empty namespace is not default for child, prefix ""');
+isDefaultNamespace(fooChild, '', false, 'Empty namespace is not default for child');
 isDefaultNamespace(fooChild, 'fooNamespace', false, 'fooNamespace is not default for child');
 isDefaultNamespace(fooChild, 'http://www.w3.org/2000/xmlns/', false, 'xmlns namespace is not default for child');
 isDefaultNamespace(fooChild, 'barURI', false, 'bar namespace is not default for child');
@@ -94,13 +97,13 @@ isDefaultNamespace(fooChild, 'childNamespace', true, 'childNamespace is default
 document.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:bar', 'barURI');
 document.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns', 'bazURI');
 
-lookupNamespaceURI(document, null, 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace, prefix null');
+lookupNamespaceURI(document, null, 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace');
-lookupNamespaceURI(document, '', 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace, prefix ""');
+lookupNamespaceURI(document, '', 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace');
 lookupNamespaceURI(document, 'prefix', null, 'Document has no namespace URI matching prefix');
 lookupNamespaceURI(document, 'bar', 'barURI', 'Document has bar namespace');
 
-isDefaultNamespace(document, null, false, 'For document, empty namespace is not default, prefix null');
+isDefaultNamespace(document, null, false, 'For document, Empty namespace is not default');
-isDefaultNamespace(document, '', false, 'For document, empty namespace is not default, prefix ""');
+isDefaultNamespace(document, '', false, 'For document, Empty namespace is not default');
 isDefaultNamespace(document, 'fooNamespace', false, 'For document, fooNamespace is not default');
 isDefaultNamespace(document, 'http://www.w3.org/2000/xmlns/', false, 'For document, xmlns namespace is not default');
 isDefaultNamespace(document, 'barURI', false, 'For document, bar namespace is not default');

testing/web-platform/tests/dom/nodes/getElementsByClassName-10.xml

@@ -6,13 +6,11 @@
  </head>
  <body>
   <div id="log"/>
-  <div id="tests">
   <x class="a"/>
   <g:x class="a"/>
-  </div>
   <script>test(function() {
                  assert_array_equals(document.getElementsByClassName("a"),
-                                     document.getElementById("tests").children);
+                                     document.getElementsByTagName("x"));
                })
   </script>
  </body>

testing/web-platform/tests/dom/nodes/getElementsByClassName-11.xml

@@ -6,18 +6,16 @@
  </head>
  <body>
   <div id="log" />
-  <div id="tests">
   <x class="a"/>
   <g:x class="a"/>
   <x t:class="a" h:class="a" g:class="a"/>
   <g:x t:class="a" h:class="a" g:class="a"/>
   <t:x class="a" t:class="a" h:class="a" g:class="a"/>
-  </div>
   <script>
    test(function() {
           var collection = document.getElementsByClassName("a");
-          var test = document.getElementById("tests").children;
+          var test = document.getElementsByTagName("x");
-          assert_array_equals(collection, [test[0], test[1], test[4]]);
+          assert_array_equals(collection, [test[0], test[1]]);
          })
   </script>
  </body>

testing/web-platform/tests/dom/nodes/selectors.js

@@ -266,9 +266,10 @@ var validSelectors = [
   {name: "Class selector, matching element with specified class",                                           selector: ".class-p",                expect: ["class-p1","class-p2", "class-p3"],                                              level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class selector, chained, matching only elements with all specified classes",                      selector: "#class .apple.orange.banana",    expect: ["class-div1", "class-div2", "class-p4", "class-div3", "class-p6", "class-div4"], level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class Selector, chained, with type selector",                                                     selector: "div.apple.banana.orange", expect: ["class-div1", "class-div2", "class-div3", "class-div4"],                         level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "Class selector, matching element with class value using non-ASCII characters (1)",                selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci",             expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  // Caution: If copying and pasting the folowing non-ASCII classes, ensure unicode normalisation is not performed in the process.
-  {name: "Class selector, matching multiple elements with class value using non-ASCII characters",          selector: ".\u53F0\u5317",                     expect: ["class-span1","class-span2"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching element with class value using non-ASCII characters",                    selector: ".台北Táiběi",             expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters (1)", selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci.\u53F0\u5317",          expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching multiple elements with class value using non-ASCII characters",          selector: ".台北",                     expect: ["class-span1","class-span2"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters", selector: ".台北Táiběi.台北",          expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character",                              selector: ".foo\\:bar",              expect: ["class-span3"],               level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character",                              selector: ".test\\.foo\\[5\\]bar",   expect: ["class-span4"],               level: 1, testType: TEST_QSA | TEST_MATCH},
 
@@ -281,9 +282,10 @@ var validSelectors = [
   {name: "ID selector, not matching non-existent ancestor",           selector: "#none #id-div1",            expect: [] /*no matches*/,      level: 1, testType: TEST_QSA},
   {name: "ID selector, matching multiple elements with duplicate id", selector: "#id-li-duplicate",          expect: ["id-li-duplicate", "id-li-duplicate", "id-li-duplicate", "id-li-duplicate"], level: 1, testType: TEST_QSA | TEST_MATCH},
 
-  {name: "ID selector, matching id value using non-ASCII characters (1)",    selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci",           expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci"],       level: 1, testType: TEST_QSA | TEST_MATCH},
+  // Caution: If copying and pasting the folowing non-ASCII IDs, ensure unicode normalisation is not performed in the process.
-  {name: "ID selector, matching id value using non-ASCII characters (2)",    selector: "#\u53F0\u5317",                   expect: ["\u53F0\u5317"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters",    selector: "#台北Táiběi",           expect: ["台北Táiběi"],       level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "ID selector, matching id values using non-ASCII characters (1)", selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci, #\u53F0\u5317",      expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci", "\u53F0\u5317"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters",    selector: "#台北",                   expect: ["台北"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id values using non-ASCII characters",   selector: "#台北Táiběi, #台北",      expect: ["台北Táiběi", "台北"], level: 1, testType: TEST_QSA | TEST_MATCH},
 
   // XXX runMatchesTest() in level2-lib.js can't handle this because obtaining the expected nodes requires escaping characters when generating the selector from 'expect' values
   {name: "ID selector, matching element with id with escaped character", selector: "#\\#foo\\:bar",         expect: ["#foo:bar"],         level: 1, testType: TEST_QSA},
@@ -629,9 +631,10 @@ var scopedSelectors = [
   {name: "Class selector, matching element with specified class (1)",                                           selector: ".class-p",                ctx: "", expect: ["class-p1","class-p2", "class-p3"],                                              level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class selector, chained, matching only elements with all specified classes (1)",                      selector: "#class .apple.orange.banana",    ctx: "", expect: ["class-div1", "class-div2", "class-p4", "class-div3", "class-p6", "class-div4"], level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class Selector, chained, with type selector (1)",                                                     selector: "div.apple.banana.orange", ctx: "", expect: ["class-div1", "class-div2", "class-div3", "class-div4"],                         level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "Class selector, matching element with class value using non-ASCII characters (2)",                    selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci",             ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  // Caution: If copying and pasting the folowing non-ASCII classes, ensure unicode normalisation is not performed in the process.
-  {name: "Class selector, matching multiple elements with class value using non-ASCII characters (1)",          selector: ".\u53F0\u5317",                     ctx: "", expect: ["class-span1","class-span2"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching element with class value using non-ASCII characters",                    selector: ".台北Táiběi",             ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters (2)", selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci.\u53F0\u5317",          ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching multiple elements with class value using non-ASCII characters (1)",          selector: ".台北",                     ctx: "", expect: ["class-span1","class-span2"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters", selector: ".台北Táiběi.台北",          ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character (1)",                              selector: ".foo\\:bar",              ctx: "", expect: ["class-span3"],               level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character (1)",                              selector: ".test\\.foo\\[5\\]bar",   ctx: "", expect: ["class-span4"],               level: 1, testType: TEST_FIND | TEST_MATCH},
 
@@ -644,9 +647,10 @@ var scopedSelectors = [
   {name: "ID selector, not matching non-existent ancestor",           selector: "#none #id-div1",            ctx: "", expect: [] /*no matches*/,      level: 1, testType: TEST_FIND},
   {name: "ID selector, matching multiple elements with duplicate id (1)", selector: "#id-li-duplicate",          ctx: "", expect: ["id-li-duplicate", "id-li-duplicate", "id-li-duplicate", "id-li-duplicate"], level: 1, testType: TEST_FIND | TEST_MATCH},
 
-  {name: "ID selector, matching id value using non-ASCII characters (3)",    selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci",           ctx: "", expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci"],       level: 1, testType: TEST_FIND | TEST_MATCH},
+  // Caution: If copying and pasting the folowing non-ASCII IDs, ensure unicode normalisation is not performed in the process.
-  {name: "ID selector, matching id value using non-ASCII characters (4)",    selector: "#\u53F0\u5317",                   ctx: "", expect: ["\u53F0\u5317"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters",    selector: "#台北Táiběi",           ctx: "", expect: ["台北Táiběi"],       level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "ID selector, matching id values using non-ASCII characters (2)",   selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci, #\u53F0\u5317",      ctx: "", expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci", "\u53F0\u5317"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (1)",    selector: "#台北",                   ctx: "", expect: ["台北"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id values using non-ASCII characters",   selector: "#台北Táiběi, #台北",      ctx: "", expect: ["台北Táiběi", "台北"], level: 1, testType: TEST_FIND | TEST_MATCH},
 
   // XXX runMatchesTest() in level2-lib.js can't handle this because obtaining the expected nodes requires escaping characters when generating the selector from 'expect' values
   {name: "ID selector, matching element with id with escaped character", selector: "#\\#foo\\:bar",         ctx: "", expect: ["#foo:bar"],         level: 1, testType: TEST_FIND},

testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html

@@ -6,11 +6,9 @@
 <script>
 var iframe;
 var t = async_test();
-onload = function() {
+onload = setTimeout(function() {
-  setTimeout(function() {
                       var iframe = document.getElementsByTagName("iframe")[0];
                       iframe.src="about:blank";
                     }, 100)
-};
 </script>
 <iframe src="008-1.html"></iframe>

testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html

@@ -6,11 +6,9 @@
 <script>
 var iframe;
 var t = async_test();
-onload = function() {
+onload = setTimeout(function() {
-  setTimeout(function() {
                       var iframe = document.getElementsByTagName("iframe")[0];
                       iframe.src="about:blank";
                     }, 100)
-}
 </script>
 <iframe src="009-1.html"></iframe>

testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html

@@ -9,7 +9,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
-<body id="tags">
+<body>
 <img src="../../../../images/green.png" name="picture">
 <script>
 test(function(){ assert_equals(document.all.length,12)}, "Test for HTMLAllCollection size");
@@ -18,6 +18,8 @@ test(function(){ assert_equals(document.all.item(0).tagName,"HTML")}, "Test look
 
 test(function(){ assert_equals(document.all[0].tagName,"HTML")}, "Test lookup by index using []");
 
+test(function(){ assert_equals(document.all.tags("script").length,3)}, "Test for multiple occurence 3 <script> found");
+
 test(function(){ assert_equals(document.all.item("picture").nodeName,"IMG")}, "Test lookup IMG by name");
 
 test(function(){ assert_equals(document.all.namedItem("picture").nodeName,"IMG")}, "Test lookup IMG by namedItem ");
@@ -25,10 +27,6 @@ test(function(){ assert_equals(document.all.namedItem("picture").nodeName,"IMG")
 test(function(){ assert_equals(document.all("picture").nodeName,"IMG")}, "Test lookup IMG in collection using ()");
 
 test(function(){ assert_equals(document.all["picture"].nodeName,"IMG")}, "Test lookup IMG in collection using []");
-
-test(function(){ assert_equals(document.all.picture.nodeName,"IMG")}, "Test lookup IMG in collection using .");
-
-test(function(){ assert_equals(document.all.tags.id,"tags")}, "Test lookup tags in collection using .");
 </script>
 <div id="log"></div>
 </body>

testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html

@@ -18,12 +18,8 @@
         <input type="checkbox" name="cb">
       </td>
     </tr>
-    <tr>
-      <td>
     <button id="btn"></button>
     <button name="btn"></button>
-      </td>
-    </tr>
   </table>
 </form>
 
@@ -54,8 +50,8 @@ test(function () {
 
 //getter - name
 test(function () {
-  assert_throws(TypeError(), function() { coll1("r1") });
+  assert_equals(coll1("r1"), rdo, "HTMLFormControlsCollection(name) should return the 'input' element in radio status.");
-}, "HTMLFormControlsCollection is not callable");
+}, "HTMLFormControlsCollection(name) must return the named item");
 
 test(function () {
   assert_equals(coll1["r1"], rdo, "HTMLFormControlsCollection[name] should return the 'input' element in radio status.");

testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset=utf-8>
-<link rel="match" href="div-align-ref.html">
-<style>
-.test { width: 50px; background-color: yellow; }
-.center { text-align: center; }
-.center .test { margin: 0 auto; }
-.left { text-align: left; }
-.left .test { margin-right: auto; }
-.right { text-align: right; }
-.right .test { margin-left: auto; }
-.rtl { direction: rtl; }
-.ltr { direction: ltr; }
-.left .margin { margin-left: 1em; }
-.right .margin { margin-right: 1em; }
-</style>
-</head>
-<body>
-<!-- Centered tests -->
-<div class=center>
-<div class=test>t א</div>
-<div class="test rtl">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div class=center>
-<div class="test left">t א</div>
-<div class="test right">t א</div>
-</div>
-
-<div class=left>
-<div class=center>
-<div class=test>t א</div>
-</div>
-</div>
-
-<!-- Left-aligned tests -->
-<div class=left>
-<div class=test>t א</div>
-<div class="test rtl">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div class="left rtl">
-<div class=test>t א</div>
-<div class="test ltr">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div class=left>
-<div class="test center">t א</div>
-<div class="test right">t א</div>
-</div>
-
-<!-- Right-aligned tests -->
-<div class=right>
-<div class=test>t א</div>
-<div class="test rtl">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div class="right rtl">
-<div class=test>t א</div>
-<div class="test ltr">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div class=right>
-<div class="test left">t א</div>
-<div class="test center">t א</div>
-</div>
-
-</body>
-</html>
-

testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html

@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset=utf-8>
-<style>
-.test { width: 50px; background-color: yellow; }
-.rtl { direction: rtl; }
-.ltr { direction: ltr; }
-[align=left] .margin { margin-left: 1em }
-[align=right] .margin { margin-right: 1em }
-</style>
-</head>
-<body>
-<!-- Centered tests -->
-<div align=center>
-<div class=test>t א</div>
-<div class="test rtl">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div align=center>
-<div class=test align=left>t א</div>
-<div class=test align=right>t א</div>
-</div>
-
-<div align=left>
-<div align=center>
-<div class=test>t א</div>
-</div>
-</div>
-
-<!-- Left-aligned tests -->
-<div align=left>
-<div class=test>t א</div>
-<div class="test rtl">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div align=left class=rtl>
-<div class=test>t א</div>
-<div class="test ltr">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div align=left>
-<div class=test align=center>t א</div>
-<div class=test align=right>t א</div>
-</div>
-
-<!-- Right-aligned tests -->
-<div align=right>
-<div class=test>t א</div>
-<div class="test rtl">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div align=right class=rtl>
-<div class=test>t א</div>
-<div class="test ltr">t א</div>
-<div class="test margin">t א</div>
-</div>
-
-<div align=right>
-<div class=test align=left>t א</div>
-<div class=test align=center>t א</div>
-</div>
-
-</body>
-</html>
-

testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html

@@ -74,19 +74,4 @@ test(function() {
   option.appendChild(document.createTextNode("text"));
   assert_equals(option.text, "text");
 }, "option.text should work if the option is in a MathML script element");
-
-test(function() {
-  var option = document.createElement("option");
-  option.appendChild(document.createTextNode("te"));
-  option.appendChild(document.createComment("comment"));
-  option.appendChild(document.createTextNode("xt"));
-  assert_equals(option.text, "text");
-}, "option.text should ignore comment children");
-test(function() {
-  var option = document.createElement("option");
-  option.appendChild(document.createTextNode("te"));
-  option.appendChild(document.createProcessingInstruction("target", "data"));
-  option.appendChild(document.createTextNode("xt"));
-  assert_equals(option.text, "text");
-}, "option.text should ignore PI children");
 </script>

testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html

@@ -43,12 +43,4 @@ test(function () {
   });
 }, "HTMLTableSectionElement deleteRow(-2)");
 
-test(function () {
-  assert_equals(tbody.rows.length, 1);
-  tbody.deleteRow(-1);
-  assert_equals(tbody.rows.length, 0);
-  tbody.deleteRow(-1);
-  assert_equals(tbody.rows.length, 0);
-}, "HTMLTableSectionElement deleteRow(-1) with no rows");
-
 </script>

testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html

@@ -35,12 +35,6 @@ test(function () {
   assert_equals(tbody.rows.length, 4);
 }, "HTMLTableSectionElement insertRow()");
 
-test(function () {
-  var trEle = tbody.insertRow(tbody.rows.length);
-  assert_equals(tbody.rows[tbody.rows.length - 1], trEle);
-  assert_equals(tbody.rows.length, 5);
-}, "HTMLTableSectionElement insertRow(rows.length)");
-
 test(function () {
   assert_throws("IndexSizeError", function () {
     tbody.insertRow(-2);

testing/web-platform/tests/lint.whitelist

@@ -108,6 +108,3 @@ W3C-TEST.ORG:subresource-integrity/refresh-header.js.headers
 # Lint doesn't know about sub.svg I guess
 PARSE-FAILED:content-security-policy/svg/including.sub.svg
 
-#Helper files that aren't valid XML
-PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.xml
-PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.xml

testing/web-platform/tests/subresource-integrity/crossorigin-creds-script.js.sub.headers

@@ -1,2 +1,2 @@
-Access-Control-Allow-Origin: {{location[scheme]}}://{{location[hostname]}}:{{ports[http][0]}}
+Access-Control-Allow-Origin: {{location[scheme]}}://{{domains[]}}:{{location[port]}}
 Access-Control-Allow-Credentials: true

testing/web-platform/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers

@@ -1,2 +1,2 @@
-Access-Control-Allow-Origin: {{location[scheme]}}://{{location[hostname]}}:{{ports[http][0]}}
+Access-Control-Allow-Origin: {{location[scheme]}}://{{domains[]}}:{{location[port]}}
 Access-Control-Allow-Credentials: true

testing/web-platform/tests/subresource-integrity/subresource-integrity.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Subresource Integrity</title>
-<script src="../../../resources/testharness.js"></script>
+<script src="/resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 
 <div id="log"></div>
 
@@ -10,15 +10,15 @@
 <script>
     // <script> tests
     var xorigin_anon_script = location.protocol
-      + '//' + location.hostname + ':' + {{ports[http][1]}}
+      + '//www1.' + location.hostname + ':' + location.port
       + '/subresource-integrity/crossorigin-anon-script.js';
 
     var xorigin_creds_script = location.protocol
-      + '//' + location.hostname + ':' + {{ports[http][1]}}
+      + '//www1.' + location.hostname + ':' + location.port
       + '/subresource-integrity/crossorigin-creds-script.js';
 
     var xorigin_ineligible_script = location.protocol
-      + '//' + location.hostname + ':' + {{ports[http][1]}}
+      + '//www1.' + location.hostname + ':' + location.port
       + '/subresource-integrity/crossorigin-ineligible-script.js';
 
     var SRIScriptTest = function(pass, name, src, integrityValue, crossoriginValue) {
@@ -52,15 +52,15 @@
     };
 
     var xorigin_anon_style = location.protocol
-      + '//' + location.hostname + ':' + {{ports[http][1]}}
+      + '//www1.' + location.hostname + ':' + location.port
       + '/subresource-integrity/crossorigin-anon-style.css';
 
     var xorigin_creds_style = location.protocol
-      + '//' + location.hostname + ':' + {{ports[http][1]}}
+      + '//www1.' + location.hostname + ':' + location.port
       + '/subresource-integrity/crossorigin-creds-style.css';
 
     var xorigin_ineligible_style = location.protocol
-      + '//' + location.hostname + ':' + {{ports[http][1]}}
+      + '//www1.' + location.hostname + ':' + location.port
       + '/subresource-integrity/crossorigin-ineligible-style.css';
 
     // <link> tests
@@ -540,6 +540,6 @@
     style_tests.execute();
 
 </script>
-<!-- TODO check cache-poisoned resources, transfer-encoding, 3xx redirect
+<!--TODO check cache-poisoned resources, transfer-encoding, 3xx redirect
    to resource with matching hash, and cross-origin leakage test as in sec5.3.
    -->

testing/web-platform/tests/tools/manifest/sourcefile.py

@@ -134,7 +134,7 @@ class SourceFile(object):
             ext = ext[1:]
         if ext in ["html", "htm"]:
             return "html"
-        if ext in ["xhtml", "xht", "xml"]:
+        if ext in ["xhtml", "xht"]:
             return "xhtml"
         if ext == "svg":
             return "svg"

testing/web-platform/tests/webstorage/idlharness.html

@@ -31,7 +31,7 @@ interface Storage {
   readonly attribute unsigned long length;
   DOMString? key(unsigned long index);
   getter DOMString? getItem(DOMString key);
-  setter void setItem(DOMString key, DOMString value);
+  setter creator void setItem(DOMString key, DOMString value);
   deleter void removeItem(DOMString key);
   void clear();
 };

testing/web-platform/update/upstream.py

@@ -2,7 +2,6 @@ import os
 import re
 import subprocess
 import sys
-import tempfile
 import urlparse
 
 from wptrunner.update.sync import LoadManifest
@@ -204,32 +203,18 @@ class MovePatches(Step):
                                      state.local_tree.root)
         self.logger.debug("Stripping patch %s" % strip_path)
 
-        if not hasattr(state, "patch"):
-            state.patch = None
-
         for commit in state.source_commits[state.commits_loaded:]:
             i = state.commits_loaded + 1
             self.logger.info("Moving commit %i: %s" % (i, commit.message.full_summary))
-            if not state.patch:
             patch = commit.export_patch(state.tests_path)
             stripped_patch = rewrite_patch(patch, strip_path)
-            else:
-                filename, stripped_patch = state.patch
-                with open(filename) as f:
-                    stripped_patch.diff = f.read()
-                state.patch = None
             try:
                 state.sync_tree.import_patch(stripped_patch)
             except:
-                with tempfile.NamedTemporaryFile(delete=False, suffix=".diff") as f:
+                print patch.diff
-                    f.write(stripped_patch.diff)
-                    print """Patch failed to apply. Diff saved in %s.
-Fix this file so it applies and run with --continue""" % f.name
-                    state.patch = (f.name, stripped_patch)
                 raise
             state.commits_loaded = i
 
-
 class RebaseCommits(Step):
     """Rebase commits from the current branch on top of the upstream destination branch.