diff options
| author | thiagopnts <thiagopnts@gmail.com> | 2014-12-14 23:54:17 -0200 |
|---|---|---|
| committer | thiagopnts <thiagopnts@gmail.com> | 2014-12-15 00:00:06 -0200 |
| commit | 60ba4a97a5251f8a8b51eee97ea55c35e5d0502f (patch) | |
| tree | f2e2b28ae30a801dd1f4a1923a288e9674ca8cb8 /components | |
| parent | 2e34125710185572d14e5ce5c9bca776c69a9f26 (diff) | |
| download | servo-60ba4a97a5251f8a8b51eee97ea55c35e5d0502f.tar.gz servo-60ba4a97a5251f8a8b51eee97ea55c35e5d0502f.zip | |
Make ErrorEvent::new take cancelable and bubbling enums
Diffstat (limited to 'components')
| -rw-r--r-- | components/script/dom/errorevent.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index a05a13188b2..ce7eb7184a9 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -13,7 +13,7 @@ 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 dom::event::{Event, EventTypeId, ErrorEventTypeId, EventBubbles, Bubbles, DoesNotBubble, EventCancelable, Cancelable, NotCancelable}; use servo_util::str::DOMString; use dom::bindings::cell::DOMRefCell; @@ -56,8 +56,8 @@ impl ErrorEvent { pub fn new(global: &GlobalRef, type_: DOMString, - can_bubble: bool, - cancelable: bool, + bubbles: EventBubbles, + cancelable: EventCancelable, message: DOMString, filename: DOMString, lineno: u32, @@ -65,7 +65,7 @@ impl ErrorEvent { 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); + event.InitEvent(type_, bubbles == Bubbles, cancelable == Cancelable); *ev.message.borrow_mut() = message; *ev.filename.borrow_mut() = filename; ev.lineno.set(lineno); @@ -91,8 +91,12 @@ impl ErrorEvent { let col_num = init.colno.unwrap_or(0); + let bubbles = if init.parent.bubbles { Bubbles } else { DoesNotBubble }; + + let cancelable = if init.parent.cancelable { Cancelable } else { NotCancelable }; + let event = ErrorEvent::new(global, type_, - init.parent.bubbles, init.parent.cancelable, + bubbles, cancelable, msg, file_name, line_num, col_num, init.error); Ok(event) |