auto merge of #5055 : Ms2ger/servo/wpt_20150224, r=jdm

21 files changed, 182 insertions, 74 deletions

diff --git a/tests/wpt/metadata/DOMEvents/tests/approved/Determined.candidate.EventListeners.html.ini b/tests/wpt/metadata/DOMEvents/tests/approved/Determined.candidate.EventListeners.html.ini
deleted file mode 100644
index c46ab0c68d5..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/approved/Determined.candidate.EventListeners.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Determined.candidate.EventListeners.html]
-  type: testharness
-  [Test Description: Once determined, the current target\'s registered candidate event listeners cannot be changed; adding or removing listeners does not affect the current target\'s candidate event listeners.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/approved/Propagation.path.target.moved.html.ini b/tests/wpt/metadata/DOMEvents/tests/approved/Propagation.path.target.moved.html.ini
deleted file mode 100644
index 457d2c7f3ec..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/approved/Propagation.path.target.moved.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Propagation.path.target.moved.html]
-  type: testharness
-  [Test Description: Once determined, the event propagation path must not be changed, even if an element in the propagation path is moved within the DOM.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/approved/Propagation.path.target.removed.html.ini b/tests/wpt/metadata/DOMEvents/tests/approved/Propagation.path.target.removed.html.ini
deleted file mode 100644
index 68e2d7e3770..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/approved/Propagation.path.target.removed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Propagation.path.target.removed.html]
-  type: testharness
-  [Test Description: Once determined, the event propagation path must not be changed, even if an element in the propagation path is removed from the DOM.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html.ini b/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html.ini
deleted file mode 100644
index c46ab0c68d5..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Determined.candidate.EventListeners.html]
-  type: testharness
-  [Test Description: Once determined, the current target\'s registered candidate event listeners cannot be changed; adding or removing listeners does not affect the current target\'s candidate event listeners.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html.ini b/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html.ini
deleted file mode 100644
index 457d2c7f3ec..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Propagation.path.target.moved.html]
-  type: testharness
-  [Test Description: Once determined, the event propagation path must not be changed, even if an element in the propagation path is moved within the DOM.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html.ini b/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html.ini
deleted file mode 100644
index 68e2d7e3770..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Propagation.path.target.removed.html]
-  type: testharness
-  [Test Description: Once determined, the event propagation path must not be changed, even if an element in the propagation path is removed from the DOM.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html.ini b/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html.ini
deleted file mode 100644
index 0b42e862e8d..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[dispatchEvent.NOT_SUPPORTED_ERR.html]
-  type: testharness
-  expected: TIMEOUT
-  [Test Description: dispatchEvent - DOMException NOT_SUPPORTED_ERR raises if the Event object has not been created using DocumentEvent.createEvent().]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html.ini b/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html.ini
deleted file mode 100644
index 02de94c28a2..00000000000
--- a/tests/wpt/metadata/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html]
-  type: testharness
-  [Test Description: dispatchEvent - EventException UNSPECIFIED_EVENT_TYPE_ERR raises if the Event.type was not specified by initializing the event before dispatchEvent was called.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 3beefc2e83e..a3f84d7fd5b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -476,9 +476,6 @@
         "url": "/DOMEvents/tests/submissions/Microsoft/support/iepreview.png"
       },
       {
-        "url": "/DOMEvents/tests/submissions/Microsoft/support/navigate.js"
-      },
-      {
         "url": "/DOMEvents/tests/submissions/Microsoft/support/style01.css"
       },
       {
@@ -1208,6 +1205,12 @@
         "url": "/cors/support.js"
       },
       {
+        "url": "/csp/assert_undefined.py"
+      },
+      {
+        "url": "/csp/csp-inline-script.html.headers"
+      },
+      {
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html"
       },
       {
@@ -9344,9 +9347,6 @@
         "url": "/DOMEvents/tests/approved/DOM.event.flow.html"
       },
       {
-        "url": "/DOMEvents/tests/approved/Determined.candidate.EventListeners.html"
-      },
-      {
         "url": "/DOMEvents/tests/approved/EventListener.dispatch.new.event.html"
       },
       {
@@ -9362,12 +9362,6 @@
         "url": "/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html"
       },
       {
-        "url": "/DOMEvents/tests/approved/Propagation.path.target.moved.html"
-      },
-      {
-        "url": "/DOMEvents/tests/approved/Propagation.path.target.removed.html"
-      },
-      {
         "url": "/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html"
       },
       {
@@ -9386,9 +9380,6 @@
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html"
       },
       {
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html"
-      },
-      {
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html"
       },
       {
@@ -9404,21 +9395,9 @@
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html"
       },
       {
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html"
-      },
-      {
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html"
-      },
-      {
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html"
       },
       {
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html"
-      },
-      {
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html"
-      },
-      {
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html"
       },
       {
@@ -10928,6 +10907,9 @@
         "url": "/cors/status.htm"
       },
       {
+        "url": "/csp/csp-inline-script.html"
+      },
+      {
         "url": "/custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html"
       },
       {
@@ -11117,9 +11099,21 @@
         "url": "/dom/events/Event-dispatch-bubbles-false.html"
       },
       {
+        "url": "/dom/events/Event-dispatch-handlers-changed.html"
+      },
+      {
         "url": "/dom/events/Event-dispatch-omitted-capture.html"
       },
       {
+        "url": "/dom/events/Event-dispatch-redispatch.html"
+      },
+      {
+        "url": "/dom/events/Event-dispatch-target-moved.html"
+      },
+      {
+        "url": "/dom/events/Event-dispatch-target-removed.html"
+      },
+      {
         "url": "/dom/events/Event-initEvent.html"
       },
       {
@@ -12197,6 +12191,9 @@
         "url": "/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html"
       },
       {
+        "url": "/html/dom/documents/dom-tree-accessors/Document.currentScript.html"
+      },
+      {
         "url": "/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html"
       },
       {
@@ -14462,6 +14459,9 @@
         "url": "/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html"
       },
       {
+        "url": "/html/syntax/parsing/the-end.html"
+      },
+      {
         "url": "/html/syntax/serializing-html-fragments/outerHTML.html"
       },
       {
@@ -14915,6 +14915,9 @@
         "url": "/notifications/event-onshow.html"
       },
       {
+        "url": "/notifications/instance.html"
+      },
+      {
         "url": "/notifications/interfaces.html"
       },
       {
@@ -18160,6 +18163,6 @@
     "deleted": [],
     "items": {}
   },
-  "rev": "a44e574f5832d164472a7c26010bfd460f74d314",
+  "rev": "b92aaee483567e9af446a6c637ceb376efb9489e",
   "url_base": "/"
 }
\ No newline at end of file
diff --git a/tests/wpt/metadata/XMLHttpRequest/interfaces.html.ini b/tests/wpt/metadata/XMLHttpRequest/interfaces.html.ini
index 3f7c008620d..bfffe9f7587 100644
--- a/tests/wpt/metadata/XMLHttpRequest/interfaces.html.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/interfaces.html.ini
@@ -74,3 +74,4 @@
 
   [XMLHttpRequest interface: existence and properties of interface object]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-handlers-changed.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-handlers-changed.html.ini
new file mode 100644
index 00000000000..7cc011a25d1
--- /dev/null
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-handlers-changed.html.ini
@@ -0,0 +1,5 @@
+[Event-dispatch-handlers-changed.html]
+  type: testharness
+  [ Dispatch additional events inside an event listener ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-redispatch.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-redispatch.html.ini
new file mode 100644
index 00000000000..6d9f99cfb0d
--- /dev/null
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-redispatch.html.ini
@@ -0,0 +1,5 @@
+[Event-dispatch-redispatch.html]
+  type: testharness
+  [EventTarget#dispatchEvent(): redispatching a native event]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-target-moved.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-target-moved.html.ini
new file mode 100644
index 00000000000..eada02233cf
--- /dev/null
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-target-moved.html.ini
@@ -0,0 +1,5 @@
+[Event-dispatch-target-moved.html]
+  type: testharness
+  [Event propagation path when an element in it is moved within the DOM]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-target-removed.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-target-removed.html.ini
new file mode 100644
index 00000000000..8343b0b1bd9
--- /dev/null
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-target-removed.html.ini
@@ -0,0 +1,5 @@
+[Event-dispatch-target-removed.html]
+  type: testharness
+  [Event propagation path when an element in it is removed from the DOM]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/interfaces.html.ini b/tests/wpt/metadata/dom/interfaces.html.ini
index 08b2e8d5f21..5c7e946e5d1 100644
--- a/tests/wpt/metadata/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/dom/interfaces.html.ini
@@ -1122,3 +1122,111 @@
   [CharacterData interface: calling replaceWith([object Object\],[object Object\]) on document.createComment("abc") with too few arguments must throw TypeError]
     expected: FAIL
 
+  [NodeFilter interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NodeFilter interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: existence and properties of interface prototype object\'s "constructor" property]
+    expected: FAIL
+
+  [NodeFilter interface: constant FILTER_ACCEPT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant FILTER_ACCEPT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant FILTER_REJECT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant FILTER_REJECT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant FILTER_SKIP on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant FILTER_SKIP on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ALL on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ALL on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ELEMENT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ELEMENT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ATTRIBUTE on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ATTRIBUTE on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_TEXT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_TEXT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_CDATA_SECTION on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_CDATA_SECTION on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ENTITY_REFERENCE on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ENTITY_REFERENCE on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ENTITY on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_ENTITY on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_PROCESSING_INSTRUCTION on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_PROCESSING_INSTRUCTION on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_COMMENT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_COMMENT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_DOCUMENT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_DOCUMENT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_DOCUMENT_TYPE on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_DOCUMENT_TYPE on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_DOCUMENT_FRAGMENT on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_DOCUMENT_FRAGMENT on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_NOTATION on interface object]
+    expected: FAIL
+
+  [NodeFilter interface: constant SHOW_NOTATION on interface prototype object]
+    expected: FAIL
+
+  [NodeFilter interface: operation acceptNode(Node)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-parent.html.ini b/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-parent.html.ini
index a78fac723d4..c4ab842bd2a 100644
--- a/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-parent.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-parent.html.ini
@@ -1,5 +1,6 @@
 [browsing-context-choose-parent.html]
   type: testharness
   expected: TIMEOUT
-  [The parent browsing context must be chosen if the given name is '_parent']
+  [The parent browsing context must be chosen if the given name is \'_parent\']
     expected: NOTRUN
+
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
new file mode 100644
index 00000000000..2da84c06d4c
--- /dev/null
+++ b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.html.ini
@@ -0,0 +1,14 @@
+[Document.currentScript.html]
+  type: testharness
+  [Script parse-inline]
+    expected: FAIL
+
+  [Script parse-ext]
+    expected: FAIL
+
+  [Script dom-inline]
+    expected: FAIL
+
+  [Script dom-ext]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 1d5c38981bb..1ae23a56514 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -9819,3 +9819,6 @@
   [Event interface: calling initEvent(DOMString,boolean,boolean) on new PopStateEvent("popstate", { data: {} }) with too few arguments must throw TypeError]
     expected: FAIL
 
+  [Window interface: existence and properties of interface prototype object]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
index 4116da857ef..c2b01ccff71 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
@@ -204,7 +204,7 @@
   [<picture><source srcset="data:,b" type="application/x-shockwave-flash"><img src="data:,a" data-expect="data:,a"></picture>]
     expected: FAIL
 
-  [<picture><source srcset="data:,b" type="image\gif"><img src="data:,a" data-expect="data:,a"></picture>]
+  [<picture><source srcset="data:,b" type="image\\gif"><img src="data:,a" data-expect="data:,a"></picture>]
     expected: FAIL
 
   [<picture><source srcset="data:,b" type="gif"><img src="data:,a" data-expect="data:,a"></picture>]
@@ -266,3 +266,4 @@
 
   [<picture><source srcset="data:,b"><img data-expect="data:,b"></picture>]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini
index e4407b783db..2c1c228a251 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini
@@ -1,5 +1,3 @@
 [004.html]
   type: testharness
-  [shared worker with multiple documents]
-    expected: FAIL
-
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests b/tests/wpt/web-platform-tests
-Subproject a44e574f5832d164472a7c26010bfd460f74d31
+Subproject b92aaee483567e9af446a6c637ceb376efb9489