Auto merge of #13193 - servo:error-workers, r=nox

Implement error reporting for workers.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13193)
<!-- Reviewable:end -->

components/script/dom/bindings/global.rs

@@ -284,7 +284,7 @@ impl<'a> GlobalRef<'a> {
     pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue) {
         match *self {
             GlobalRef::Window(ref window) => window.report_an_error(error_info, value),
-            GlobalRef::Worker(_) => (),
+            GlobalRef::Worker(ref worker) => worker.report_an_error(error_info, value),
         }
     }
 }

components/script/dom/dedicatedworkerglobalscope.rs

@@ -10,15 +10,18 @@ use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::DedicatedWorkerGlobalScopeBinding;
 use dom::bindings::codegen::Bindings::DedicatedWorkerGlobalScopeBinding::DedicatedWorkerGlobalScopeMethods;
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
-use dom::bindings::error::ErrorResult;
+use dom::bindings::error::{ErrorInfo, ErrorResult};
 use dom::bindings::global::{GlobalRef, global_root_from_context};
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{Root, RootCollection};
 use dom::bindings::reflector::Reflectable;
 use dom::bindings::str::DOMString;
 use dom::bindings::structuredclone::StructuredCloneData;
+use dom::errorevent::ErrorEvent;
+use dom::event::{Event, EventBubbles, EventCancelable};
+use dom::eventtarget::EventTarget;
 use dom::messageevent::MessageEvent;
-use dom::worker::{TrustedWorkerAddress, WorkerMessageHandler};
+use dom::worker::{TrustedWorkerAddress, WorkerErrorHandler, WorkerMessageHandler};
 use dom::workerglobalscope::WorkerGlobalScope;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
@@ -32,6 +35,7 @@ use rand::random;
 use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort, StackRootTLS, get_reports, new_rt_and_cx};
 use script_runtime::ScriptThreadEventCategory::WorkerEvent;
 use script_traits::{TimerEvent, TimerSource, WorkerGlobalScopeInit, WorkerScriptLoadOrigin};
+use std::cell::Cell;
 use std::mem::replace;
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::AtomicBool;
@@ -88,6 +92,8 @@ pub struct DedicatedWorkerGlobalScope {
     #[ignore_heap_size_of = "Can't measure trait objects"]
     /// Sender to the parent thread.
     parent_sender: Box<ScriptChan + Send>,
+    /// https://html.spec.whatwg.org/multipage/#in-error-reporting-mode
+    in_error_reporting_mode: Cell<bool>
 }
 
 impl DedicatedWorkerGlobalScope {
@@ -116,6 +122,7 @@ impl DedicatedWorkerGlobalScope {
             timer_event_port: timer_event_port,
             parent_sender: parent_sender,
             worker: DOMRefCell::new(None),
+            in_error_reporting_mode: Cell::new(false),
         }
     }
 
@@ -339,6 +346,42 @@ impl DedicatedWorkerGlobalScope {
             }
         }
     }
+
+    /// 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.
+        // FIXME(#13195): muted errors.
+        let event = ErrorEvent::new(GlobalRef::Worker(self.upcast()),
+                                    atom!("error"),
+                                    EventBubbles::DoesNotBubble,
+                                    EventCancelable::Cancelable,
+                                    error_info.message.as_str().into(),
+                                    error_info.filename.as_str().into(),
+                                    error_info.lineno,
+                                    error_info.column,
+                                    value);
+
+        // Step 13.
+        let handled = !event.upcast::<Event>().fire(self.upcast::<EventTarget>());
+        if !handled {
+            let worker = self.worker.borrow().as_ref().unwrap().clone();
+            // TODO: Should use the DOM manipulation task source.
+            self.parent_sender
+                .send(CommonScriptMsg::RunnableMsg(WorkerEvent,
+                                                   box WorkerErrorHandler::new(worker, error_info)))
+                .unwrap();
+        }
+
+        self.in_error_reporting_mode.set(false);
+    }
 }
 
 #[allow(unsafe_code)]

components/script/dom/webidls/WorkerGlobalScope.webidl

@@ -9,7 +9,7 @@ interface WorkerGlobalScope : EventTarget {
   readonly attribute WorkerLocation location;
 
   //void close();
-  //         attribute OnErrorEventHandler onerror;
+  attribute OnErrorEventHandler onerror;
   //         attribute EventHandler onlanguagechange;
   //         attribute EventHandler onoffline;
   //         attribute EventHandler ononline;

components/script/dom/window.rs

@@ -1766,6 +1766,7 @@ impl Window {
         self.in_error_reporting_mode.set(true);
 
         // Steps 3-12.
+        // FIXME(#13195): muted errors.
         let event = ErrorEvent::new(GlobalRef::Window(self),
                                     atom!("error"),
                                     EventBubbles::DoesNotBubble,

components/script/dom/worker.rs

@@ -8,7 +8,7 @@ use dom::abstractworker::WorkerScriptMsg;
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
 use dom::bindings::codegen::Bindings::WorkerBinding;
 use dom::bindings::codegen::Bindings::WorkerBinding::WorkerMethods;
-use dom::bindings::error::{Error, ErrorResult, Fallible};
+use dom::bindings::error::{Error, ErrorResult, Fallible, ErrorInfo};
 use dom::bindings::global::GlobalRef;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::Root;
@@ -17,11 +17,13 @@ use dom::bindings::reflector::{Reflectable, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::bindings::structuredclone::StructuredCloneData;
 use dom::dedicatedworkerglobalscope::DedicatedWorkerGlobalScope;
+use dom::errorevent::ErrorEvent;
+use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::EventTarget;
 use dom::messageevent::MessageEvent;
 use dom::workerglobalscope::prepare_workerscope_init;
 use ipc_channel::ipc;
-use js::jsapi::{HandleValue, JSAutoCompartment, JSContext};
+use js::jsapi::{HandleValue, JSAutoCompartment, JSContext, NullHandleValue};
 use js::jsval::UndefinedValue;
 use script_thread::Runnable;
 use script_traits::WorkerScriptLoadOrigin;
@@ -137,6 +139,26 @@ impl Worker {
         let worker = address.root();
         worker.upcast().fire_simple_event("error");
     }
+
+    fn dispatch_error(&self, error_info: ErrorInfo) {
+        let global = self.global();
+        let event = ErrorEvent::new(global.r(),
+                                    atom!("error"),
+                                    EventBubbles::DoesNotBubble,
+                                    EventCancelable::Cancelable,
+                                    error_info.message.as_str().into(),
+                                    error_info.filename.as_str().into(),
+                                    error_info.lineno,
+                                    error_info.column,
+                                    NullHandleValue);
+
+        let handled = !event.upcast::<Event>().fire(self.upcast::<EventTarget>());
+        if handled {
+            return;
+        }
+
+        global.r().report_an_error(error_info, NullHandleValue);
+    }
 }
 
 impl WorkerMethods for Worker {
@@ -202,3 +224,24 @@ impl Runnable for SimpleWorkerErrorHandler<Worker> {
         Worker::dispatch_simple_error(this.addr);
     }
 }
+
+pub struct WorkerErrorHandler {
+    address: Trusted<Worker>,
+    error_info: ErrorInfo,
+}
+
+impl WorkerErrorHandler {
+    pub fn new(address: Trusted<Worker>, error_info: ErrorInfo) -> WorkerErrorHandler {
+        WorkerErrorHandler {
+            address: address,
+            error_info: error_info,
+        }
+    }
+}
+
+impl Runnable for WorkerErrorHandler {
+    fn handler(self: Box<Self>) {
+        let this = *self;
+        this.address.root().dispatch_error(this.error_info);
+    }
+}

components/script/dom/workerglobalscope.rs

@@ -3,9 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId};
+use dom::bindings::codegen::Bindings::EventHandlerBinding::OnErrorEventHandlerNonNull;
 use dom::bindings::codegen::Bindings::FunctionBinding::Function;
 use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods;
-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;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{JS, MutNullableHeap, Root};
@@ -248,6 +249,9 @@ impl WorkerGlobalScopeMethods for WorkerGlobalScope {
         })
     }
 
+    // https://html.spec.whatwg.org/multipage/#handler-workerglobalscope-onerror
+    error_event_handler!(error, GetOnerror, SetOnerror);
+
     // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts
     fn ImportScripts(&self, url_strings: Vec<DOMString>) -> ErrorResult {
         let mut urls = Vec::with_capacity(url_strings.len());
@@ -451,4 +455,11 @@ impl WorkerGlobalScope {
             closing.store(true, Ordering::SeqCst);
         }
     }
+
+    /// https://html.spec.whatwg.org/multipage/#report-the-error
+    pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue) {
+        self.downcast::<DedicatedWorkerGlobalScope>()
+            .expect("Should implement report_an_error for this worker")
+            .report_an_error(error_info, value);
+    }
 }

tests/wpt/metadata/WebCryptoAPI/digest/digest.worker.js.ini

@@ -1,6 +1,6 @@
 [digest.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [SHA-1 with empty source data]
     expected: FAIL
 

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/aes_cbc.worker.js.ini

@@ -1,3 +1,3 @@
 [aes_cbc.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/aes_ctr.worker.js.ini

@@ -1,3 +1,3 @@
 [aes_ctr.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/aes_gcm.worker.js.ini

@@ -1,3 +1,3 @@
 [aes_gcm.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/rsa.worker.js.ini

@@ -1,3 +1,3 @@
 [rsa.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures.worker.js.ini

@@ -1,3 +1,3 @@
 [failures.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_AES-CBC.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_AES-CTR.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_AES-GCM.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_AES-KW.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_ECDH.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_ECDSA.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_HMAC.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_RSA-OAEP.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_RSA-PSS.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.worker.js.ini

@@ -1,3 +1,3 @@
 [failures_RSASSA-PKCS1-v1_5.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes.worker.js.ini

@@ -1,3 +1,3 @@
 [successes.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_AES-CBC.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_AES-CTR.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_AES-GCM.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_AES-KW.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_ECDH.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_ECDSA.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_HMAC.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_RSA-OAEP.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_RSA-PSS.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR

tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.worker.js.ini

@@ -1,3 +1,3 @@
 [successes_RSASSA-PKCS1-v1_5.worker]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR