diff options
Diffstat (limited to 'components/script/dom/uievent.rs')
| -rw-r--r-- | components/script/dom/uievent.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index eac29a4ab24..86501d47324 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -9,7 +9,7 @@ use dom::bindings::codegen::InheritTypes::{EventCast, UIEventDerived}; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::global; -use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, OptionalSettable}; +use dom::bindings::js::{MutNullableJS, JSRef, RootedReference, Temporary, OptionalSettable}; use dom::bindings::trace::Traceable; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::event::{Event, EventTypeId, UIEventTypeId}; @@ -17,12 +17,13 @@ use dom::window::Window; use servo_util::str::DOMString; use std::cell::Cell; +use std::default::Default; #[jstraceable] #[must_root] pub struct UIEvent { pub event: Event, - view: Cell<Option<JS<Window>>>, + view: MutNullableJS<Window>, detail: Traceable<Cell<i32>> } @@ -36,7 +37,7 @@ impl UIEvent { pub fn new_inherited(type_id: EventTypeId) -> UIEvent { UIEvent { event: Event::new_inherited(type_id), - view: Cell::new(None), + view: Default::default(), detail: Traceable::new(Cell::new(0)), } } @@ -70,7 +71,7 @@ impl UIEvent { impl<'a> UIEventMethods for JSRef<'a, UIEvent> { fn GetView(self) -> Option<Temporary<Window>> { - self.view.get().map(|view| Temporary::new(view)) + self.view.get() } fn Detail(self) -> i32 { |