diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-10-14 12:47:48 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-10-14 12:47:48 -0600 |
commit | 32daa17d5cbcad02db0713e21e52410cdc60480e (patch) | |
tree | d5cf3137ab06523b1c8958d830751b74642f048e /components/script/dom/event.rs | |
parent | 8db8a86ab1e943b5102a05d6d31800579fdb7875 (diff) | |
parent | aab2c40389c71c4b0db3ffa75bdec99cd440b8af (diff) | |
download | servo-32daa17d5cbcad02db0713e21e52410cdc60480e.tar.gz servo-32daa17d5cbcad02db0713e21e52410cdc60480e.zip |
Auto merge of #7873 - nox:codegen-typeid, r=Ms2ger
Generate the various TypeId enums in codegen
This frees us forever from caring about maintaining these enums. The last commit removes their use from the initialisation of interface objects derived from Node.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7873)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/event.rs')
-rw-r--r-- | components/script/dom/event.rs | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index 4d7fdde5baa..c3a8a52dc55 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -10,7 +10,6 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::eventtarget::EventTarget; -use dom::uievent::{UIEventTypeId}; use std::borrow::ToOwned; use std::cell::Cell; use std::default::Default; @@ -27,19 +26,6 @@ pub enum EventPhase { Bubbling = EventConstants::BUBBLING_PHASE, } -#[derive(JSTraceable, PartialEq, HeapSizeOf)] -pub enum EventTypeId { - CustomEvent, - HTMLEvent, - MessageEvent, - ProgressEvent, - StorageEvent, - UIEvent(UIEventTypeId), - ErrorEvent, - CloseEvent, - WebGLContextEvent, -} - #[derive(PartialEq, HeapSizeOf)] pub enum EventBubbles { Bubbles, @@ -55,7 +41,6 @@ pub enum EventCancelable { #[dom_struct] pub struct Event { reflector_: Reflector, - type_id: EventTypeId, current_target: MutNullableHeap<JS<EventTarget>>, target: MutNullableHeap<JS<EventTarget>>, type_: DOMRefCell<DOMString>, @@ -72,10 +57,9 @@ pub struct Event { } impl Event { - pub fn new_inherited(type_id: EventTypeId) -> Event { + pub fn new_inherited() -> Event { Event { reflector_: Reflector::new(), - type_id: type_id, current_target: Default::default(), target: Default::default(), phase: Cell::new(EventPhase::None), @@ -93,7 +77,7 @@ impl Event { } pub fn new_uninitialized(global: GlobalRef) -> Root<Event> { - reflect_dom_object(box Event::new_inherited(EventTypeId::HTMLEvent), + reflect_dom_object(box Event::new_inherited(), global, EventBinding::Wrap) } @@ -116,11 +100,6 @@ impl Event { } #[inline] - pub fn type_id(&self) -> &EventTypeId { - &self.type_id - } - - #[inline] pub fn clear_current_target(&self) { self.current_target.set(None); } |