aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/uievent.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/uievent.rs')
-rw-r--r--components/script/dom/uievent.rs17
1 files changed, 5 insertions, 12 deletions
diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs
index 4c85e7a16f9..7ae21211616 100644
--- a/components/script/dom/uievent.rs
+++ b/components/script/dom/uievent.rs
@@ -5,25 +5,18 @@
use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use dom::bindings::codegen::Bindings::UIEventBinding;
use dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods;
-use dom::bindings::codegen::InheritTypes::{EventCast, UIEventDerived};
+use dom::bindings::codegen::InheritTypes::{EventCast, EventTypeId, UIEventDerived};
use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::Root;
use dom::bindings::js::{JS, MutNullableHeap, RootedReference};
use dom::bindings::utils::reflect_dom_object;
-use dom::event::{Event, EventBubbles, EventCancelable, EventTypeId};
+use dom::event::{Event, EventBubbles, EventCancelable};
use dom::window::Window;
use std::cell::Cell;
use std::default::Default;
use util::str::DOMString;
-#[derive(JSTraceable, PartialEq, HeapSizeOf)]
-pub enum UIEventTypeId {
- MouseEvent,
- KeyboardEvent,
- UIEvent,
-}
-
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#interface-UIEvent
#[dom_struct]
pub struct UIEvent {
@@ -42,16 +35,16 @@ impl UIEventDerived for Event {
}
impl UIEvent {
- pub fn new_inherited(type_id: UIEventTypeId) -> UIEvent {
+ pub fn new_inherited() -> UIEvent {
UIEvent {
- event: Event::new_inherited(EventTypeId::UIEvent(type_id)),
+ event: Event::new_inherited(),
view: Default::default(),
detail: Cell::new(0),
}
}
pub fn new_uninitialized(window: &Window) -> Root<UIEvent> {
- reflect_dom_object(box UIEvent::new_inherited(UIEventTypeId::UIEvent),
+ reflect_dom_object(box UIEvent::new_inherited(),
GlobalRef::Window(window),
UIEventBinding::Wrap)
}