Dispatch error events at the window object.

components/script/dom/bindings/callback.rs

@@ -191,7 +191,7 @@ impl<'a> Drop for CallSetup<'a> {
             JS_LeaveCompartment(self.cx, self.old_compartment);
             if self.handling == ExceptionHandling::Report {
                 let _ac = JSAutoCompartment::new(self.cx, *self.exception_compartment);
-                report_pending_exception(self.cx);
+                report_pending_exception(self.cx, true);
             }
         }
     }

components/script/dom/bindings/error.rs

@@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionMethods;
 use dom::bindings::codegen::PrototypeList::proto_id_to_name;
 use dom::bindings::conversions::root_from_object;
 use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible};
-use dom::bindings::global::GlobalRef;
+use dom::bindings::global::{GlobalRef, global_root_from_context};
 use dom::bindings::str::USVString;
 use dom::domexception::{DOMErrorName, DOMException};
 use js::error::{throw_range_error, throw_type_error};
@@ -132,11 +132,16 @@ pub unsafe fn throw_dom_exception(cx: *mut JSContext, global: GlobalRef, result:
     JS_SetPendingException(cx, thrown.handle());
 }
 
-struct ErrorInfo {
+/// A struct encapsulating information about a runtime script error.
-    filename: String,
+pub struct ErrorInfo {
-    message: String,
+    /// The error message.
-    lineno: c_uint,
+    pub message: String,
-    column: c_uint,
+    /// The file name.
+    pub filename: String,
+    /// The line number.
+    pub lineno: c_uint,
+    /// The column number.
+    pub column: c_uint,
 }
 
 impl ErrorInfo {
@@ -192,7 +197,10 @@ impl ErrorInfo {
 }
 
 /// Report a pending exception, thereby clearing it.
-pub unsafe fn report_pending_exception(cx: *mut JSContext) {
+///
+/// The `dispatch_event` argument is temporary and non-standard; passing false
+/// prevents dispatching the `error` event.
+pub unsafe fn report_pending_exception(cx: *mut JSContext, dispatch_event: bool) {
     if JS_IsExceptionPending(cx) {
         rooted!(in(cx) let mut value = UndefinedValue());
         if !JS_GetPendingException(cx, value.handle_mut()) {
@@ -202,22 +210,31 @@ pub unsafe fn report_pending_exception(cx: *mut JSContext) {
         }
 
         JS_ClearPendingException(cx);
-        if !value.is_object() {
+        let error_info = if value.is_object() {
-            match USVString::from_jsval(cx, value.handle(), ()) {
+            rooted!(in(cx) let object = value.to_object());
-                Ok(ConversionResult::Success(USVString(string))) => error!("Uncaught exception: {}", string),
+            let error_info = ErrorInfo::from_native_error(cx, object.handle())
-                _ => error!("Uncaught exception: failed to stringify primitive"),
+                .or_else(|| ErrorInfo::from_dom_exception(object.handle()));
+            match error_info {
+                Some(error_info) => error_info,
+                None => {
+                    error!("Uncaught exception: failed to extract information");
+                    return;
+                }
             }
-            return;
+        } else {
-        }
+            match USVString::from_jsval(cx, value.handle(), ()) {
-
+                Ok(ConversionResult::Success(USVString(string))) => {
-        rooted!(in(cx) let object = value.to_object());
+                    ErrorInfo {
-        let error_info = ErrorInfo::from_native_error(cx, object.handle())
+                        message: format!("uncaught exception: {}", string),
-            .or_else(|| ErrorInfo::from_dom_exception(object.handle()));
+                        filename: String::new(),
-        let error_info = match error_info {
+                        lineno: 0,
-            Some(error_info) => error_info,
+                        column: 0,
-            None => {
+                    }
-                error!("Uncaught exception: failed to extract information");
+                },
-                return;
+                _ => {
+                    error!("Uncaught exception: failed to stringify primitive");
+                    return;
+                },
             }
         };
 
@@ -226,6 +243,13 @@ pub unsafe fn report_pending_exception(cx: *mut JSContext) {
                error_info.lineno,
                error_info.column,
                error_info.message);
+
+        if dispatch_event {
+            let global = global_root_from_context(cx);
+            if let GlobalRef::Window(window) = global.r() {
+                window.report_an_error(error_info, value.handle());
+            }
+        }
     }
 }
 

components/script/dom/eventtarget.rs

@@ -427,7 +427,8 @@ impl EventTarget {
             // Step 1.8.2
             unsafe {
                 let _ac = JSAutoCompartment::new(cx, self.reflector().get_jsobject().get());
-                report_pending_exception(cx);
+                // FIXME(#13152): dispatch error event.
+                report_pending_exception(cx, false);
             }
             // Step 1.8.1 / 1.8.3
             return None;

components/script/dom/window.rs

@@ -14,7 +14,7 @@ use dom::bindings::codegen::Bindings::FunctionBinding::Function;
 use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use dom::bindings::codegen::Bindings::WindowBinding::{ScrollBehavior, ScrollToOptions};
 use dom::bindings::codegen::Bindings::WindowBinding::{self, FrameRequestCallback, WindowMethods};
-use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception};
+use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception, ErrorInfo};
 use dom::bindings::global::{GlobalRef, global_root_from_object};
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{JS, MutNullableHeap, Root};
@@ -30,7 +30,8 @@ use dom::crypto::Crypto;
 use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration};
 use dom::document::Document;
 use dom::element::Element;
-use dom::event::Event;
+use dom::errorevent::ErrorEvent;
+use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::EventTarget;
 use dom::history::History;
 use dom::htmliframeelement::build_mozbrowser_custom_event;
@@ -273,6 +274,9 @@ pub struct Window {
 
     /// A list of scroll offsets for each scrollable element.
     scroll_offsets: DOMRefCell<HashMap<UntrustedNodeAddress, Point2D<f32>>>,
+
+    /// https://html.spec.whatwg.org/multipage/#in-error-reporting-mode
+    in_error_reporting_mode: Cell<bool>
 }
 
 impl Window {
@@ -952,7 +956,7 @@ impl<'a, T: Reflectable> ScriptHelpers for &'a T {
                                   code.len() as libc::size_t,
                                   rval) {
                         debug!("error evaluating JS string");
-                        report_pending_exception(cx);
+                        report_pending_exception(cx, true);
                     }
                 }
 
@@ -1742,6 +1746,7 @@ impl Window {
             ignore_further_async_events: Arc::new(AtomicBool::new(false)),
             error_reporter: error_reporter,
             scroll_offsets: DOMRefCell::new(HashMap::new()),
+            in_error_reporting_mode: Cell::new(false),
         };
 
         WindowBinding::Wrap(runtime.cx(), win)
@@ -1749,6 +1754,34 @@ impl Window {
     pub fn live_devtools_updates(&self) -> bool {
         return self.devtools_wants_updates.get();
     }
+
+    /// https://html.spec.whatwg.org/multipage/#report-the-error
+    pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue) {
+        // Step 1.
+        if self.in_error_reporting_mode.get() {
+            return;
+        }
+
+        // Step 2.
+        self.in_error_reporting_mode.set(true);
+
+        // Steps 3-12.
+        let event = ErrorEvent::new(GlobalRef::Window(self),
+                                    atom!("error"),
+                                    EventBubbles::DoesNotBubble,
+                                    EventCancelable::Cancelable,
+                                    error_info.message.into(),
+                                    error_info.filename.into(),
+                                    error_info.lineno,
+                                    error_info.column,
+                                    value);
+
+        // Step 13.
+        event.upcast::<Event>().fire(self.upcast::<EventTarget>());
+
+        // Step 14.
+        self.in_error_reporting_mode.set(false);
+    }
 }
 
 fn should_move_clip_rect(clip_rect: Rect<Au>, new_viewport: Rect<f32>) -> bool {

components/script/dom/workerglobalscope.rs

@@ -384,7 +384,7 @@ impl WorkerGlobalScope {
                     unsafe {
                         let _ac = JSAutoCompartment::new(self.runtime.cx(),
                                                          self.reflector().get_jsobject().get());
-                        report_pending_exception(self.runtime.cx());
+                        report_pending_exception(self.runtime.cx(), true);
                     }
                 }
             }

tests/wpt/metadata-css/cssom-1_dev/html/cssstylerule.htm.ini

@@ -1,3 +1,3 @@
 [cssstylerule.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata-css/cssom-1_dev/html/index-003.htm.ini

@@ -1,3 +1,3 @@
 [index-003.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata-css/cssom-1_dev/html/matchMedia.htm.ini

@@ -1,3 +1,3 @@
 [matchMedia.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata-css/cssom-view-1_dev/html/matchMedia.htm.ini

@@ -1,3 +1,3 @@
 [matchMedia.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata-css/cssom-view-1_dev/html/matchMediaAddListener.htm.ini

@@ -1,3 +1,3 @@
 [matchMediaAddListener.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/digest/test_digest.html.ini

@@ -1,5 +1,6 @@
 [test_digest.html]
   type: testharness
+  expected: ERROR
   [SHA-1 with empty source data]
     expected: FAIL
 

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_cbc.html.ini

@@ -1,3 +1,3 @@
 [test_aes_cbc.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_ctr.html.ini

@@ -1,3 +1,3 @@
 [test_aes_ctr.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_gcm.html.ini

@@ -1,3 +1,3 @@
 [test_aes_gcm.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_rsa_oaep.html.ini

@@ -1,3 +1,3 @@
 [test_rsa_oaep.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/XMLHttpRequest/open-url-multi-window-6.htm.ini

@@ -1,6 +1,6 @@
 [open-url-multi-window-6.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [XMLHttpRequest: open() in document that is not fully active (but may be active) should throw]
     expected: NOTRUN
 

tests/wpt/metadata/dom/events/Event-dispatch-throwing.html.ini

@@ -1,8 +0,0 @@
-[Event-dispatch-throwing.html]
-  type: testharness
-  [Throwing in event listener with a single listeners]
-    expected: FAIL
-
-  [Throwing in event listener with multiple listeners]
-    expected: FAIL
-

tests/wpt/metadata/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html.ini

@@ -1,6 +1,5 @@
 [Element-getElementsByTagName-change-document-HTMLNess.html]
   type: testharness
-  expected: TIMEOUT
   [Untitled]
-    expected: NOTRUN
+    expected: FAIL
 

tests/wpt/metadata/fetch/api/request/request-cache.html.ini

@@ -1,5 +1,6 @@
 [request-cache.html]
   type: testharness
+  expected: ERROR
   [RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with Etag and stale response]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/request/request-clone.sub.html.ini

@@ -1,3 +1,3 @@
 [request-clone.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/fetch/api/request/request-consume-empty.html.ini

@@ -1,5 +1,6 @@
 [request-consume-empty.html]
   type: testharness
+  expected: ERROR
   [Consume request's body as text]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/request/request-consume.html.ini

@@ -1,5 +1,6 @@
 [request-consume.html]
   type: testharness
+  expected: ERROR
   [Consume request's body as text]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini

@@ -1,3 +1,3 @@
 [request-disturbed.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/fetch/api/request/request-init-002.html.ini

@@ -1,5 +1,6 @@
 [request-init-002.html]
   type: testharness
+  expected: ERROR
   [Initialize Request with headers values]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/request/request-init-003.sub.html.ini

@@ -1,3 +1,3 @@
 [request-init-003.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/fetch/api/response/response-cancel-stream.html.ini

@@ -1,5 +1,6 @@
 [response-cancel-stream.html]
   type: testharness
+  expected: ERROR
   [Cancelling a starting blob Response stream]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-clone.html.ini

@@ -1,3 +1,3 @@
 [response-clone.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/fetch/api/response/response-consume-empty.html.ini

@@ -1,5 +1,6 @@
 [response-consume-empty.html]
   type: testharness
+  expected: ERROR
   [Consume response's body as text]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini

@@ -1,5 +1,6 @@
 [response-consume-stream.html]
   type: testharness
+  expected: ERROR
   [Read empty text response's body as readableStream]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-consume.html.ini

@@ -1,5 +1,6 @@
 [response-consume.html]
   type: testharness
+  expected: ERROR
   [Consume response's body as text]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-init-001.html.ini

@@ -1,3 +1,3 @@
 [response-init-001.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/fetch/api/response/response-init-002.html.ini

@@ -1,5 +1,6 @@
 [response-init-002.html]
   type: testharness
+  expected: ERROR
   [Initialize Response with headers values]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-stream-disturbed-1.html.ini

@@ -1,5 +1,6 @@
 [response-stream-disturbed-1.html]
   type: testharness
+  expected: ERROR
   [Getting blob after getting the Response body - not disturbed, not locked]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-stream-disturbed-2.html.ini

@@ -1,5 +1,6 @@
 [response-stream-disturbed-2.html]
   type: testharness
+  expected: ERROR
   [Getting blob after getting a locked Response body]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-stream-disturbed-3.html.ini

@@ -1,5 +1,6 @@
 [response-stream-disturbed-3.html]
   type: testharness
+  expected: ERROR
   [Getting blob after reading the Response body]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-stream-disturbed-4.html.ini

@@ -1,5 +1,6 @@
 [response-stream-disturbed-4.html]
   type: testharness
+  expected: ERROR
   [Getting blob after cancelling the Response body]
     expected: FAIL
 

tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini

@@ -1,5 +1,6 @@
 [response-stream-disturbed-5.html]
   type: testharness
+  expected: ERROR
   [Getting a body reader after consuming as blob]
     expected: FAIL
 

tests/wpt/metadata/html/browsers/history/the-history-interface/008.html.ini

@@ -1,3 +1,3 @@
 [008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/001.html.ini

@@ -1,6 +1,6 @@
 [001.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Session history length on initial load]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/002.html.ini

@@ -1,6 +1,6 @@
 [002.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Session history length on initial load]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html.ini

@@ -1,6 +1,6 @@
 [allow_prototype_cycle_through_location.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [same-origin, same-window location cycle]
     expected: FAIL
 

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_open_write.html.ini

@@ -1,3 +1,3 @@
 [reload_document_open_write.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write.html.ini

@@ -1,3 +1,3 @@
 [reload_document_write.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write_onload.html.ini

@@ -1,3 +1,3 @@
 [reload_document_write_onload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_post_1.html.ini

@@ -1,3 +1,3 @@
 [reload_post_1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html.ini

@@ -1,6 +1,6 @@
 [scripted_click_assign_during_load.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Assignment to location with click during load]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html.ini

@@ -1,6 +1,6 @@
 [scripted_click_location_assign_during_load.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [location.assign with click during load]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html.ini

@@ -1,6 +1,6 @@
 [scripted_form_submit_assign_during_load.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Assignment to location with form submit during load]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html.ini

@@ -1,3 +1,3 @@
 [cross-origin-objects.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini

@@ -1,6 +1,6 @@
 [close_beforeunload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Running beforeunload handler in window.close()]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini

@@ -1,6 +1,6 @@
 [close_unload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Running unload handler in window.close()]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html.ini

@@ -1,6 +1,6 @@
 [discard_iframe_history_1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document removes it from history]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html.ini

@@ -1,6 +1,6 @@
 [discard_iframe_history_2.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document via innerHTML removes it from history]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html.ini

@@ -1,6 +1,6 @@
 [discard_iframe_history_3.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document removes it from history]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html.ini

@@ -1,6 +1,6 @@
 [discard_iframe_history_4.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document removes it from history]
     expected: NOTRUN
 

tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html.ini

@@ -1,6 +1,6 @@
 [browsing-context-choose-existing.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The browsing context must be chosen if the given name is same as its name]
     expected: NOTRUN
 

tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini

@@ -1,9 +1,6 @@
 [Document.currentScript.sub.html]
   type: testharness
   expected: TIMEOUT
-  [Script script-window-error]
-    expected: FAIL
-
   [Script script-svg]
     expected: NOTRUN
 

tests/wpt/metadata/html/dom/interfaces.html.ini

@@ -9002,3 +9002,4 @@
 
   [Event interface: calling initEvent(DOMString,boolean,boolean) on new TrackEvent("addtrack", {track:document.createElement("track").track}) with too few arguments must throw TypeError]
     expected: FAIL
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini

@@ -1,6 +1,6 @@
 [video_008.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [HTML5 Media Elements: 'media' attribute]
     expected: NOTRUN
 

tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html.ini

@@ -1,6 +1,6 @@
 [iframe_sandbox_allow_script.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [iframe_sandbox_allow_scripts]
     expected: NOTRUN
 

tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html.ini

@@ -1,3 +1,3 @@
 [move_iframe_in_dom_01.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html.ini

@@ -1,3 +1,3 @@
 [move_iframe_in_dom_02.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html.ini

@@ -1,3 +1,3 @@
 [move_iframe_in_dom_04.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/html/semantics/forms/constraints/form-validation-checkValidity.html.ini

@@ -1,5 +1,6 @@
 [form-validation-checkValidity.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] no constraint]
     expected: FAIL
 

tests/wpt/metadata/html/semantics/forms/constraints/form-validation-reportValidity.html.ini

@@ -1,5 +1,6 @@
 [form-validation-reportValidity.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] no constraint]
     expected: FAIL
 

tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-customError.html.ini

@@ -1,5 +1,6 @@
 [form-validation-validity-customError.html]
   type: testharness
+  expected: ERROR
   [[input\]  The validity.customError must be true if the custom validity error message is not empty]
     expected: FAIL
 

tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valid.html.ini

@@ -1,5 +1,6 @@
 [form-validation-validity-valid.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] validity.valid must be false if validity.tooLong is true]
     expected: FAIL
 

tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini

@@ -1,5 +1,6 @@
 [form-validation-validity-valueMissing.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] The required attribute is not set]
     expected: FAIL
 

tests/wpt/metadata/html/semantics/forms/constraints/form-validation-willValidate.html.ini

@@ -1,5 +1,6 @@
 [form-validation-willValidate.html]
   type: testharness
+  expected: ERROR
   [[INPUT in HIDDEN status\] Must be barred from the constraint validation]
     expected: FAIL
 

tests/wpt/metadata/html/webappapis/animation-frames/callback-exception.html.ini

@@ -1,7 +0,0 @@
-[callback-exception.html]
-  type: testharness
-  expected: TIMEOUT
-  bug: https://github.com/servo/servo/issues/3311
-  [requestAnimationFrame callback exceptions are reported to error handler]
-    expected: TIMEOUT
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/addEventListener.html.ini

@@ -0,0 +1,5 @@
+[addEventListener.html]
+  type: testharness
+  [window.onerror - addEventListener]
+    expected: FAIL
+

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html.ini

@@ -1,5 +0,0 @@
-[body-onerror-compile-error-data-url.html]
-  type: testharness
-  [<]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html.ini

@@ -1,5 +0,0 @@
-[body-onerror-compile-error.html]
-  type: testharness
-  [<]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html.ini

@@ -1,5 +0,0 @@
-[body-onerror-runtime-error.html]
-  type: testharness
-  [<]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-data-url.html.ini

@@ -1,8 +0,0 @@
-[compile-error-data-url.html]
-  type: testharness
-  [window.onerror - compile error in ]
-    expected: FAIL
-
-  [window.onerror - compile error in <script src=data:...> (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html.ini

@@ -3,6 +3,3 @@
   [window.onerror - compile error in setInterval]
     expected: FAIL
 
-  [window.onerror - compile error in setInterval (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html.ini

@@ -3,6 +3,3 @@
   [window.onerror - compile error in setTimeout]
     expected: FAIL
 
-  [window.onerror - compile error in setTimeout (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html.ini

@@ -1,8 +0,0 @@
-[compile-error-same-origin.html]
-  type: testharness
-  [window.onerror - compile error in ]
-    expected: FAIL
-
-  [window.onerror - compile error in <script src=...> (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error.html.ini

@@ -1,8 +0,0 @@
-[compile-error.html]
-  type: testharness
-  [window.onerror - compile error in ]
-    expected: FAIL
-
-  [window.onerror - compile error in <script> (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html.ini

@@ -1,8 +0,0 @@
-[runtime-error-data-url.html]
-  type: testharness
-  [window.onerror - runtime error in ]
-    expected: FAIL
-
-  [window.onerror - runtime error in <script src=data:...> (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html.ini

@@ -1,8 +0,0 @@
-[runtime-error-in-attribute.html]
-  type: testharness
-  [window.onerror - runtime error in attribute]
-    expected: FAIL
-
-  [window.onerror - runtime error in attribute (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html.ini

@@ -1,5 +0,0 @@
-[runtime-error-in-body-onerror.html]
-  type: testharness
-  [runtime error in ]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html.ini

@@ -3,6 +3,3 @@
   [window.onerror - runtime error in setInterval]
     expected: FAIL
 
-  [window.onerror - runtime error in setInterval (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html.ini

@@ -3,6 +3,3 @@
   [window.onerror - runtime error in setTimeout]
     expected: FAIL
 
-  [window.onerror - runtime error in setTimeout (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html.ini

@@ -1,5 +0,0 @@
-[runtime-error-in-window-onerror.html]
-  type: testharness
-  [runtime error in window.onerror]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html.ini

@@ -1,8 +0,0 @@
-[runtime-error-same-origin.html]
-  type: testharness
-  [window.onerror - runtime error in ]
-    expected: FAIL
-
-  [window.onerror - runtime error in <script src=...> (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error.html.ini

@@ -1,8 +0,0 @@
-[runtime-error.html]
-  type: testharness
-  [window.onerror - runtime error in ]
-    expected: FAIL
-
-  [window.onerror - runtime error in <script> (column)]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html.ini

@@ -1,5 +1,5 @@
 [window-onerror-parse-error.html]
   type: testharness
-  [correct number of calls to window.onerror]
+  [correct line number passed to window.onerror]
     expected: FAIL
 

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html.ini

@@ -1,5 +0,0 @@
-[window-onerror-runtime-error-throw.html]
-  type: testharness
-  [correct number of calls to window.onerror]
-    expected: FAIL
-

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html.ini

@@ -1,5 +1,5 @@
 [window-onerror-runtime-error.html]
   type: testharness
-  [correct number of calls to window.onerror]
+  [correct line number passed to window.onerror]
     expected: FAIL
 

tests/wpt/metadata/html/webappapis/timers/evil-spec-example.html.ini

@@ -1,6 +1,6 @@
 [evil-spec-example.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Interaction of setTimeout and WebIDL]
     expected: NOTRUN
 

tests/wpt/metadata/navigation-timing/test_document_open.html.ini

@@ -1,3 +1,3 @@
 [test_document_open.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/navigation-timing/test_navigation_redirectCount_none.html.ini

@@ -1,5 +1,6 @@
 [test_navigation_redirectCount_none.html]
   type: testharness
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_navigation_type_backforward.html.ini

@@ -1,6 +1,6 @@
 [test_navigation_type_backforward.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_navigation_type_reload.html.ini

@@ -1,6 +1,6 @@
 [test_navigation_type_reload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_no_previous_document.html.ini

@@ -1,6 +1,6 @@
 [test_no_previous_document.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_timing_attributes_order.html.ini

@@ -1,6 +1,6 @@
 [test_timing_attributes_order.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_timing_reload.html.ini

@@ -1,6 +1,6 @@
 [test_timing_reload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_timing_server_redirect.html.ini

@@ -1,5 +1,6 @@
 [test_timing_server_redirect.html]
   type: testharness
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 

tests/wpt/metadata/navigation-timing/test_timing_xserver_redirect.html.ini

@@ -1,6 +1,6 @@
 [test_timing_xserver_redirect.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL