diff options
author | Ms2ger <ms2ger@gmail.com> | 2014-07-27 20:22:13 +0200 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2014-07-27 23:00:17 +0200 |
commit | 944d8b00b05c41a272f59eb8d24886ece8bcc95b (patch) | |
tree | 706088bb79c7f33c954837352228dd03170a8171 /src/components/script/dom/mouseevent.rs | |
parent | 38a658d561a316031f190f3f1f2055b0be78553f (diff) | |
download | servo-944d8b00b05c41a272f59eb8d24886ece8bcc95b.tar.gz servo-944d8b00b05c41a272f59eb8d24886ece8bcc95b.zip |
Call the generated rather than the hand-written traits (fixes #2936).
Diffstat (limited to 'src/components/script/dom/mouseevent.rs')
-rw-r--r-- | src/components/script/dom/mouseevent.rs | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index aa164c1eafb..aa750b501ba 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -3,6 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::Bindings::MouseEventBinding; +use dom::bindings::codegen::Bindings::MouseEventBinding::MouseEventMethods; +use dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use dom::bindings::codegen::InheritTypes::{UIEventCast, MouseEventDerived}; use dom::bindings::error::Fallible; use dom::bindings::global::{GlobalRef, Window}; @@ -11,7 +13,7 @@ use dom::bindings::trace::Traceable; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::event::{Event, MouseEventTypeId}; use dom::eventtarget::EventTarget; -use dom::uievent::{UIEvent, UIEventMethods}; +use dom::uievent::UIEvent; use dom::window::Window; use servo_util::str::DOMString; use std::cell::Cell; @@ -100,35 +102,6 @@ impl MouseEvent { } } -pub trait MouseEventMethods { - fn ScreenX(&self) -> i32; - fn ScreenY(&self) -> i32; - fn ClientX(&self) -> i32; - fn ClientY(&self) -> i32; - fn CtrlKey(&self) -> bool; - fn ShiftKey(&self) -> bool; - fn AltKey(&self) -> bool; - fn MetaKey(&self) -> bool; - fn Button(&self) -> i16; - fn GetRelatedTarget(&self) -> Option<Temporary<EventTarget>>; - fn InitMouseEvent(&self, - typeArg: DOMString, - canBubbleArg: bool, - cancelableArg: bool, - viewArg: Option<JSRef<Window>>, - detailArg: i32, - screenXArg: i32, - screenYArg: i32, - clientXArg: i32, - clientYArg: i32, - ctrlKeyArg: bool, - altKeyArg: bool, - shiftKeyArg: bool, - metaKeyArg: bool, - buttonArg: i16, - relatedTargetArg: Option<JSRef<EventTarget>>); -} - impl<'a> MouseEventMethods for JSRef<'a, MouseEvent> { fn ScreenX(&self) -> i32 { self.screen_x.deref().get() |