added ErrorEvent WebIDL and errorevent.rs

7 files changed, 154 insertions, 33 deletions

diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs
new file mode 100644
index 00000000000..a05a13188b2
--- /dev/null
+++ b/components/script/dom/errorevent.rs
@@ -0,0 +1,130 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
+use dom::bindings::codegen::Bindings::ErrorEventBinding;
+use dom::bindings::codegen::Bindings::ErrorEventBinding::ErrorEventMethods;
+use dom::bindings::codegen::InheritTypes::{EventCast, ErrorEventDerived};
+use dom::bindings::error::Fallible;
+use dom::bindings::global::GlobalRef;
+use dom::bindings::js::{JSRef, Temporary};
+use js::jsapi::JSContext;
+use dom::bindings::trace::JSTraceable;
+
+use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
+use dom::event::{Event, EventTypeId, ErrorEventTypeId};
+use servo_util::str::DOMString;
+
+use dom::bindings::cell::DOMRefCell;
+use std::cell::{Cell};
+use js::jsval::{JSVal, NullValue};
+
+#[dom_struct]
+pub struct ErrorEvent {
+    event: Event,
+    message: DOMRefCell<DOMString>,
+    filename: DOMRefCell<DOMString>,
+    lineno: Cell<u32>,
+    colno: Cell<u32>,
+    error: Cell<JSVal>
+}
+
+impl ErrorEventDerived for Event {
+    fn is_errorevent(&self) -> bool {
+        *self.type_id() == ErrorEventTypeId
+    }
+}
+
+impl ErrorEvent {
+    fn new_inherited(type_id: EventTypeId) -> ErrorEvent {
+        ErrorEvent {
+            event: Event::new_inherited(type_id),
+            message: DOMRefCell::new("".to_string()),
+            filename: DOMRefCell::new("".to_string()),
+            lineno: Cell::new(0),
+            colno: Cell::new(0),
+            error: Cell::new(NullValue())
+        }
+    }
+
+    pub fn new_uninitialized(global: &GlobalRef) -> Temporary<ErrorEvent> {
+        reflect_dom_object(box ErrorEvent::new_inherited(ErrorEventTypeId),
+                           *global,
+                           ErrorEventBinding::Wrap)
+    }
+
+    pub fn new(global: &GlobalRef,
+               type_: DOMString,
+               can_bubble: bool,
+               cancelable: bool,
+               message: DOMString,
+               filename: DOMString,
+               lineno: u32,
+               colno: u32,
+               error: JSVal) -> Temporary<ErrorEvent> {
+        let ev = ErrorEvent::new_uninitialized(global).root();
+        let event: JSRef<Event> = EventCast::from_ref(*ev);
+        event.InitEvent(type_, can_bubble, cancelable);
+        *ev.message.borrow_mut() = message;
+        *ev.filename.borrow_mut() = filename;
+        ev.lineno.set(lineno);
+        ev.colno.set(colno);
+        ev.error.set(error);
+        Temporary::from_rooted(*ev)
+    }
+
+    pub fn Constructor(global: &GlobalRef,
+                       type_: DOMString,
+                       init: &ErrorEventBinding::ErrorEventInit) -> Fallible<Temporary<ErrorEvent>>{
+        let msg = match init.message.as_ref() {
+            Some(message) => message.clone(),
+            None => "".to_string(),
+        };
+
+        let file_name = match init.filename.as_ref() {
+            None => "".into_string(),
+            Some(filename) => filename.clone(),
+        };
+
+        let line_num = init.lineno.unwrap_or(0);
+
+        let col_num = init.colno.unwrap_or(0);
+
+        let event = ErrorEvent::new(global, type_,
+                                init.parent.bubbles, init.parent.cancelable,
+                                msg, file_name,
+                                line_num, col_num, init.error);
+        Ok(event)
+    }
+
+}
+
+impl<'a> ErrorEventMethods for JSRef<'a, ErrorEvent> {
+    fn Lineno(self) -> u32 {
+        self.lineno.get()
+    }
+
+    fn Colno(self) -> u32 {
+        self.colno.get()
+    }
+
+    fn Message(self) -> DOMString {
+        self.message.borrow().clone()
+    }
+
+    fn Filename(self) -> DOMString {
+        self.filename.borrow().clone()
+    }
+
+    fn Error(self, _cx: *mut JSContext) -> JSVal {
+        self.error.get()
+    }
+
+}
+
+impl Reflectable for ErrorEvent {
+    fn reflector<'a>(&'a self) -> &'a Reflector {
+        self.event.reflector()
+    }
+}
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs
index 5169d144f59..637bd259035 100644
--- a/components/script/dom/event.rs
+++ b/components/script/dom/event.rs
@@ -33,7 +33,8 @@ pub enum EventTypeId {
     MessageEventTypeId,
     MouseEventTypeId,
     ProgressEventTypeId,
-    UIEventTypeId
+    UIEventTypeId,
+    ErrorEventTypeId
 }
 
 #[deriving(PartialEq)]
diff --git a/components/script/dom/webidls/ErrorEvent.webidl b/components/script/dom/webidls/ErrorEvent.webidl
new file mode 100644
index 00000000000..824cf5f1d18
--- /dev/null
+++ b/components/script/dom/webidls/ErrorEvent.webidl
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+[Constructor(DOMString type, optional ErrorEventInit eventInitDict)/*, Exposed=(Window,Worker)*/]
+interface ErrorEvent : Event {
+  readonly attribute DOMString message;
+  readonly attribute DOMString filename;
+  readonly attribute unsigned long lineno;
+  readonly attribute unsigned long colno;
+  readonly attribute any error;
+};
+
+dictionary ErrorEventInit : EventInit {
+  DOMString message;
+  DOMString filename;
+  unsigned long lineno;
+  unsigned long colno;
+  any error;
+};
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 3470cd63652..40161b98191 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -103,6 +103,7 @@ pub mod dom {
     pub mod domparser;
     pub mod domtokenlist;
     pub mod element;
+    pub mod errorevent;
     pub mod event;
     pub mod eventdispatcher;
     pub mod eventtarget;
diff --git a/tests/content/test_interfaces.html b/tests/content/test_interfaces.html
index 1d14d3587a4..2989fb83957 100644
--- a/tests/content/test_interfaces.html
+++ b/tests/content/test_interfaces.html
@@ -69,6 +69,7 @@ var interfaceNamesInGlobalScope = [
   "DOMTokenList",
   "DOMStringMap",
   "Element",
+  "ErrorEvent"
   "Event",
   "EventTarget",
   "File",
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 2d8b680bd9a..64c36bd5bde 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -8103,33 +8103,9 @@
   [EventTarget interface: calling dispatchEvent(Event) on window.applicationCache with too few arguments must throw TypeError]
     expected: FAIL
 
-  [ErrorEvent interface: existence and properties of interface object]
-    expected: FAIL
-
   [ErrorEvent interface object length]
     expected: FAIL
 
-  [ErrorEvent interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [ErrorEvent interface: existence and properties of interface prototype object\'s "constructor" property]
-    expected: FAIL
-
-  [ErrorEvent interface: attribute message]
-    expected: FAIL
-
-  [ErrorEvent interface: attribute filename]
-    expected: FAIL
-
-  [ErrorEvent interface: attribute lineno]
-    expected: FAIL
-
-  [ErrorEvent interface: attribute colno]
-    expected: FAIL
-
-  [ErrorEvent interface: attribute error]
-    expected: FAIL
-
   [Navigator interface object length]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/Worker_dispatchEvent_ErrorEvent.htm.ini b/tests/wpt/metadata/workers/Worker_dispatchEvent_ErrorEvent.htm.ini
deleted file mode 100644
index 84845361cab..00000000000
--- a/tests/wpt/metadata/workers/Worker_dispatchEvent_ErrorEvent.htm.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[Worker_dispatchEvent_ErrorEvent.htm]
-  type: testharness
-  [initErrorEvent]
-    expected: FAIL
-
-  [ ErrorEvent and Worker.dispatchEvent() ]
-    expected: FAIL
-