Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move EventTargetTypeId/NodeTypeId to DOMClass

Browse source
This commit is contained in:
Michael Wu 2015-07-10 21:27:41 -04:00 • committed by Anthony Ramine
parent 8d7ba12f28
commit 941f7dc04b
24 changed files with 149 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/dom/eventtarget.rs
View file

@ -7,6 +7,7 @@ use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
use dom::bindings::codegen::Bindings::EventListenerBinding::EventListener;
use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods;
use dom::bindings::conversions::get_dom_class;
use dom::bindings::error::Error::InvalidState;
use dom::bindings::error::{Fallible, report_pending_exception};
use dom::bindings::utils::{Reflectable, Reflector};
@ -45,9 +46,10 @@ pub enum ListenerPhase {
Bubbling,
}
#[derive(JSTraceable, Copy, Clone)]
#[derive(HeapSizeOf)]
#[derive(Copy, Clone)]
pub enum EventTargetTypeId {
EventTarget,
Node(NodeTypeId),
WebSocket,
Window,
@ -132,15 +134,13 @@ pub struct EventListenerEntry {
#[dom_struct]
pub struct EventTarget {
reflector_: Reflector,
type_id: EventTargetTypeId,
handlers: DOMRefCell<HashMap<DOMString, Vec<EventListenerEntry>, DefaultState<FnvHasher>>>,
}
impl EventTarget {
pub fn new_inherited(type_id: EventTargetTypeId) -> EventTarget {
pub fn new_inherited() -> EventTarget {
EventTarget {
reflector_: Reflector::new(),
type_id: type_id,
handlers: DOMRefCell::new(Default::default()),
}
}
@ -159,9 +159,12 @@ impl EventTarget {
})
}
#[inline]
#[allow(unsafe_code)]
pub fn type_id(&self) -> &EventTargetTypeId {
&self.type_id
let domclass = unsafe {
get_dom_class(self.reflector_.get_jsobject().get()).unwrap()
};
domclass.type_id.as_ref().unwrap()
}
pub fn dispatch_event_with_target(&self,