Remove Traceable from event.rs

components/script/dom/event.rs

@@ -7,7 +7,6 @@ use dom::bindings::codegen::Bindings::EventBinding::{EventConstants, EventMethod
 use dom::bindings::error::Fallible;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{MutNullableJS, JSRef, Temporary};
-use dom::bindings::trace::Traceable;
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::eventtarget::EventTarget;
 use servo_util::str::DOMString;
@@ -43,16 +42,16 @@ pub struct Event {
     reflector_: Reflector,
     pub current_target: MutNullableJS<EventTarget>,
     pub target: MutNullableJS<EventTarget>,
-    type_: Traceable<RefCell<DOMString>>,
+    type_: RefCell<DOMString>,
-    pub phase: Traceable<Cell<EventPhase>>,
+    pub phase: Cell<EventPhase>,
-    pub canceled: Traceable<Cell<bool>>,
+    pub canceled: Cell<bool>,
-    pub stop_propagation: Traceable<Cell<bool>>,
+    pub stop_propagation: Cell<bool>,
-    pub stop_immediate: Traceable<Cell<bool>>,
+    pub stop_immediate: Cell<bool>,
-    pub cancelable: Traceable<Cell<bool>>,
+    pub cancelable: Cell<bool>,
-    pub bubbles: Traceable<Cell<bool>>,
+    pub bubbles: Cell<bool>,
-    pub trusted: Traceable<Cell<bool>>,
+    pub trusted: Cell<bool>,
-    pub dispatching: Traceable<Cell<bool>>,
+    pub dispatching: Cell<bool>,
-    pub initialized: Traceable<Cell<bool>>,
+    pub initialized: Cell<bool>,
     timestamp: u64,
 }
 
@@ -63,16 +62,16 @@ impl Event {
             reflector_: Reflector::new(),
             current_target: Default::default(),
             target: Default::default(),
-            phase: Traceable::new(Cell::new(PhaseNone)),
+            phase: Cell::new(PhaseNone),
-            type_: Traceable::new(RefCell::new("".to_string())),
+            type_: RefCell::new("".to_string()),
-            canceled: Traceable::new(Cell::new(false)),
+            canceled: Cell::new(false),
-            cancelable: Traceable::new(Cell::new(true)),
+            cancelable: Cell::new(true),
-            bubbles: Traceable::new(Cell::new(false)),
+            bubbles: Cell::new(false),
-            trusted: Traceable::new(Cell::new(false)),
+            trusted: Cell::new(false),
-            dispatching: Traceable::new(Cell::new(false)),
+            dispatching: Cell::new(false),
-            stop_propagation: Traceable::new(Cell::new(false)),
+            stop_propagation: Cell::new(false),
-            stop_immediate: Traceable::new(Cell::new(false)),
+            stop_immediate: Cell::new(false),
-            initialized: Traceable::new(Cell::new(false)),
+            initialized: Cell::new(false),
             timestamp: time::get_time().sec as u64,
         }
     }
@@ -88,7 +87,7 @@ impl Event {
                can_bubble: bool,
                cancelable: bool) -> Temporary<Event> {
         let event = Event::new_uninitialized(global).root();
-        event.deref().InitEvent(type_, can_bubble, cancelable);
+        event.InitEvent(type_, can_bubble, cancelable);
         Temporary::from_rooted(*event)
     }
 
@@ -101,11 +100,11 @@ impl Event {
 
 impl<'a> EventMethods for JSRef<'a, Event> {
     fn EventPhase(self) -> u16 {
-        self.phase.deref().get() as u16
+        self.phase.get() as u16
     }
 
     fn Type(self) -> DOMString {
-        self.type_.deref().borrow().clone()
+        self.type_.borrow().clone()
     }
 
     fn GetTarget(self) -> Option<Temporary<EventTarget>> {
@@ -117,30 +116,30 @@ impl<'a> EventMethods for JSRef<'a, Event> {
     }
 
     fn DefaultPrevented(self) -> bool {
-        self.canceled.deref().get()
+        self.canceled.get()
     }
 
     fn PreventDefault(self) {
-        if self.cancelable.deref().get() {
+        if self.cancelable.get() {
-            self.canceled.deref().set(true)
+            self.canceled.set(true)
         }
     }
 
     fn StopPropagation(self) {
-        self.stop_propagation.deref().set(true);
+        self.stop_propagation.set(true);
     }
 
     fn StopImmediatePropagation(self) {
-        self.stop_immediate.deref().set(true);
+        self.stop_immediate.set(true);
-        self.stop_propagation.deref().set(true);
+        self.stop_propagation.set(true);
     }
 
     fn Bubbles(self) -> bool {
-        self.bubbles.deref().get()
+        self.bubbles.get()
     }
 
     fn Cancelable(self) -> bool {
-        self.cancelable.deref().get()
+        self.cancelable.get()
     }
 
     fn TimeStamp(self) -> u64 {
@@ -151,22 +150,22 @@ impl<'a> EventMethods for JSRef<'a, Event> {
                  type_: DOMString,
                  bubbles: bool,
                  cancelable: bool) {
-        self.initialized.deref().set(true);
+        self.initialized.set(true);
-        if self.dispatching.deref().get() {
+        if self.dispatching.get() {
             return;
         }
-        self.stop_propagation.deref().set(false);
+        self.stop_propagation.set(false);
-        self.stop_immediate.deref().set(false);
+        self.stop_immediate.set(false);
-        self.canceled.deref().set(false);
+        self.canceled.set(false);
-        self.trusted.deref().set(false);
+        self.trusted.set(false);
         self.target.clear();
-        *self.type_.deref().borrow_mut() = type_;
+        *self.type_.borrow_mut() = type_;
-        self.bubbles.deref().set(bubbles);
+        self.bubbles.set(bubbles);
-        self.cancelable.deref().set(cancelable);
+        self.cancelable.set(cancelable);
     }
 
     fn IsTrusted(self) -> bool {
-        self.trusted.deref().get()
+        self.trusted.get()
     }
 }
 

components/script/dom/eventdispatcher.rs

@@ -15,18 +15,18 @@ use dom::virtualmethods::vtable_for;
 pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
                               pseudo_target: Option<JSRef<'b, EventTarget>>,
                               event: JSRef<Event>) -> bool {
-    assert!(!event.deref().dispatching.deref().get());
+    assert!(!event.dispatching.get());
 
     event.target.assign(Some(match pseudo_target {
         Some(pseudo_target) => pseudo_target,
         None => target.clone(),
     }));
-    event.dispatching.deref().set(true);
+    event.dispatching.set(true);
 
     let type_ = event.Type();
 
     //TODO: no chain if not participating in a tree
-    let mut chain: Vec<Root<EventTarget>> = if target.deref().is_node() {
+    let mut chain: Vec<Root<EventTarget>> = if target.is_node() {
         let target_node: JSRef<Node> = NodeCast::to_ref(target).unwrap();
         target_node.ancestors().map(|ancestor| {
             let ancestor_target: JSRef<EventTarget> = EventTargetCast::from_ref(ancestor);
@@ -36,7 +36,7 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
         vec!()
     };
 
-    event.deref().phase.deref().set(PhaseCapturing);
+    event.phase.set(PhaseCapturing);
 
     //FIXME: The "callback this value" should be currentTarget
 
@@ -49,12 +49,12 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
                     // Explicitly drop any exception on the floor.
                     let _ = listener.HandleEvent_(**cur_target, event, ReportExceptions);
 
-                    if event.deref().stop_immediate.deref().get() {
+                    if event.stop_immediate.get() {
                         break;
                     }
                 }
 
-                event.deref().stop_propagation.deref().get()
+                event.stop_propagation.get()
             }
             None => false
         };
@@ -65,17 +65,17 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
     }
 
     /* at target */
-    if !event.deref().stop_propagation.deref().get() {
+    if !event.stop_propagation.get() {
-        event.phase.deref().set(PhaseAtTarget);
+        event.phase.set(PhaseAtTarget);
         event.current_target.assign(Some(target.clone()));
 
-        let opt_listeners = target.deref().get_listeners(type_.as_slice());
+        let opt_listeners = target.get_listeners(type_.as_slice());
         for listeners in opt_listeners.iter() {
             for listener in listeners.iter() {
                 // Explicitly drop any exception on the floor.
                 let _ = listener.HandleEvent_(target, event, ReportExceptions);
 
-                if event.deref().stop_immediate.deref().get() {
+                if event.stop_immediate.get() {
                     break;
                 }
             }
@@ -83,23 +83,23 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
     }
 
     /* bubbling */
-    if event.deref().bubbles.deref().get() && !event.deref().stop_propagation.deref().get() {
+    if event.bubbles.get() && !event.stop_propagation.get() {
-        event.deref().phase.deref().set(PhaseBubbling);
+        event.phase.set(PhaseBubbling);
 
         for cur_target in chain.iter() {
-            let stopped = match cur_target.deref().get_listeners_for(type_.as_slice(), Bubbling) {
+            let stopped = match cur_target.get_listeners_for(type_.as_slice(), Bubbling) {
                 Some(listeners) => {
-                    event.deref().current_target.assign(Some(cur_target.deref().clone()));
+                    event.current_target.assign(Some(cur_target.deref().clone()));
                     for listener in listeners.iter() {
                         // Explicitly drop any exception on the floor.
                         let _ = listener.HandleEvent_(**cur_target, event, ReportExceptions);
 
-                        if event.deref().stop_immediate.deref().get() {
+                        if event.stop_immediate.get() {
                             break;
                         }
                     }
 
-                    event.deref().stop_propagation.deref().get()
+                    event.stop_propagation.get()
                 }
                 None => false
             };
@@ -131,8 +131,8 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
         let _ = chain.pop();
     }
 
-    event.dispatching.deref().set(false);
+    event.dispatching.set(false);
-    event.phase.deref().set(PhaseNone);
+    event.phase.set(PhaseNone);
     event.current_target.clear();
 
     !event.DefaultPrevented()

components/script/dom/eventtarget.rs

@@ -122,7 +122,7 @@ impl<'a> EventTargetHelpers for JSRef<'a, EventTarget> {
     fn dispatch_event_with_target(self,
                                   target: Option<JSRef<EventTarget>>,
                                   event: JSRef<Event>) -> Fallible<bool> {
-        if event.deref().dispatching.deref().get() || !event.deref().initialized.deref().get() {
+        if event.deref().dispatching.get() || !event.deref().initialized.get() {
             return Err(InvalidState);
         }
         Ok(dispatch_event(self, target, event))