diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-02 21:35:48 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-02 21:35:48 +0000 |
| commit | 9a6ee3bc91dbb302c73f2355236466cacfeb604f (patch) | |
| tree | f5c15b3cd852ef5f0735ec825d34dd767cda9994 /views/events/event_x.cc | |
| parent | 9833514789f079b3d8353ce2cf43ec64e4e92b69 (diff) | |
| download | chromium_src-9a6ee3bc91dbb302c73f2355236466cacfeb604f.zip chromium_src-9a6ee3bc91dbb302c73f2355236466cacfeb604f.tar.gz chromium_src-9a6ee3bc91dbb302c73f2355236466cacfeb604f.tar.bz2 | |
Remove RootView::ConvertPointToMouseHandler.
The function does not seem to do what it claims to do, and it does not seem to
be actually necessary at all. Remove some other unused event constructors.
BUG=chromium-os:14715
TEST=none
Review URL: http://codereview.chromium.org/6883293
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/events/event_x.cc')
| -rw-r--r-- | views/events/event_x.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/views/events/event_x.cc b/views/events/event_x.cc index 65a1281..5441282 100644 --- a/views/events/event_x.cc +++ b/views/events/event_x.cc @@ -137,6 +137,8 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) { case GenericEvent: { XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(native_event->xcookie.data); + if (TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid)) + return GetTouchEventType(native_event); switch (xievent->evtype) { case XI_ButtonPress: return (xievent->detail == 4 || xievent->detail == 5) ? @@ -189,7 +191,7 @@ gfx::Point GetEventLocation(XEvent* xev) { return gfx::Point(); } -int GetLocatedEventFlags(XEvent* xev, bool touch) { +int GetLocatedEventFlags(XEvent* xev) { switch (xev->type) { case ButtonPress: case ButtonRelease: @@ -202,6 +204,8 @@ int GetLocatedEventFlags(XEvent* xev, bool touch) { #if defined(HAVE_XINPUT2) case GenericEvent: { XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data); + bool touch = + TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid); switch (xievent->evtype) { case XI_ButtonPress: case XI_ButtonRelease: @@ -298,7 +302,7 @@ LocatedEvent::LocatedEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) : Event(native_event_2, EventTypeFromNative(native_event_2), - GetLocatedEventFlags(native_event_2, false), + GetLocatedEventFlags(native_event_2), from_native), location_(GetEventLocation(native_event_2)) { } @@ -368,9 +372,7 @@ MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, #if defined(HAVE_XINPUT2) TouchEvent::TouchEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) - : LocatedEvent(GetTouchEventType(native_event_2), - GetEventLocation(native_event_2), - GetLocatedEventFlags(native_event_2, true)), + : LocatedEvent(native_event_2, from_native), touch_id_(GetTouchIDFromXEvent(native_event_2)), radius_(GetTouchRadiusFromXEvent(native_event_2)), angle_(GetTouchAngleFromXEvent(native_event_2)), |