Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use internal mutability for UIEvent.

Browse source
This commit is contained in:
Ms2ger 2014-06-10 16:13:00 +02:00
parent 781299aaa6
commit 2aefa3f805
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/components/script/dom/uievent.rs
View file

@ -4,8 +4,9 @@
use dom::bindings::codegen::Bindings::UIEventBinding; use dom::bindings::codegen::Bindings::UIEventBinding;
use dom::bindings::codegen::InheritTypes::{EventCast, UIEventDerived}; use dom::bindings::codegen::InheritTypes::{EventCast, UIEventDerived};
use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, OptionalSettable};
use dom::bindings::error::Fallible; use dom::bindings::error::Fallible;
use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, OptionalSettable};
use dom::bindings::trace::Untraceable;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::event::{Event, EventMethods, EventTypeId, UIEventTypeId}; use dom::event::{Event, EventMethods, EventTypeId, UIEventTypeId};
use dom::window::Window; use dom::window::Window;
@ -18,7 +19,7 @@ use std::cell::Cell;
pub struct UIEvent { pub struct UIEvent {
pub event: Event, pub event: Event,
pub view: Cell<Option<JS<Window>>>, pub view: Cell<Option<JS<Window>>>,
pub detail: i32 pub detail: Untraceable<Cell<i32>>
} }
impl UIEventDerived for Event { impl UIEventDerived for Event {
@ -32,7 +33,7 @@ impl UIEvent {
UIEvent { UIEvent {
event: Event::new_inherited(type_id), event: Event::new_inherited(type_id),
view: Cell::new(None), view: Cell::new(None),
detail: 0 detail: Untraceable::new(Cell::new(0)),
} }
} }
@ -48,8 +49,8 @@ impl UIEvent {
cancelable: bool, cancelable: bool,
view: Option<JSRef<Window>>, view: Option<JSRef<Window>>,
detail: i32) -> Temporary<UIEvent> { detail: i32) -> Temporary<UIEvent> {
let mut ev = UIEvent::new_uninitialized(window).root(); let ev = UIEvent::new_uninitialized(window).root();
ev.InitUIEvent(type_, can_bubble, cancelable, view, detail); ev.deref().InitUIEvent(type_, can_bubble, cancelable, view, detail);
Temporary::from_rooted(&*ev) Temporary::from_rooted(&*ev)
} }
@ -66,7 +67,7 @@ impl UIEvent {
pub trait UIEventMethods { pub trait UIEventMethods {
fn GetView(&self) -> Option<Temporary<Window>>; fn GetView(&self) -> Option<Temporary<Window>>;
fn Detail(&self) -> i32; fn Detail(&self) -> i32;
fn InitUIEvent(&mut self, fn InitUIEvent(&self,
type_: DOMString, type_: DOMString,
can_bubble: bool, can_bubble: bool,
cancelable: bool, cancelable: bool,
@ -80,21 +81,19 @@ impl<'a> UIEventMethods for JSRef<'a, UIEvent> {
} }
fn Detail(&self) -> i32 { fn Detail(&self) -> i32 {
self.detail self.detail.deref().get()
} }
fn InitUIEvent(&mut self, fn InitUIEvent(&self,
type_: DOMString, type_: DOMString,
can_bubble: bool, can_bubble: bool,
cancelable: bool, cancelable: bool,
view: Option<JSRef<Window>>, view: Option<JSRef<Window>>,
detail: i32) { detail: i32) {
{ let event: &JSRef<Event> = EventCast::from_ref(self);
let event: &JSRef<Event> = EventCast::from_ref(self); event.InitEvent(type_, can_bubble, cancelable);
event.InitEvent(type_, can_bubble, cancelable);
}
self.view.assign(view); self.view.assign(view);
self.detail = detail; self.detail.deref().set(detail);
} }
} }