added ErrorEvent WebIDL and errorevent.rs

This commit is contained in:
Ronak Nisher 2014-10-25 11:53:14 -07:00 committed by Josh Matthews
parent 90b0369cdf
commit cbed366bea
7 changed files with 154 additions and 33 deletions

View file

@ -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()
}
}

View file

@ -33,7 +33,8 @@ pub enum EventTypeId {
MessageEventTypeId,
MouseEventTypeId,
ProgressEventTypeId,
UIEventTypeId
UIEventTypeId,
ErrorEventTypeId
}
#[deriving(PartialEq)]

View file

@ -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;
};

View file

@ -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;

View file

@ -69,6 +69,7 @@ var interfaceNamesInGlobalScope = [
"DOMTokenList",
"DOMStringMap",
"Element",
"ErrorEvent"
"Event",
"EventTarget",
"File",

View file

@ -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

View file

@ -1,8 +0,0 @@
[Worker_dispatchEvent_ErrorEvent.htm]
type: testharness
[initErrorEvent]
expected: FAIL
[ ErrorEvent and Worker.dispatchEvent() ]
expected: FAIL