Chromium Code Reviews| Index: ui/events/x/events_x.cc |
| diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc |
| index 9bf87c0e24c4e4b2a25aeedddf4d00b1340f4d0e..744ee8f02b2d97dcd8b8eb2d72715dc459c8f763 100644 |
| --- a/ui/events/x/events_x.cc |
| +++ b/ui/events/x/events_x.cc |
| @@ -442,6 +442,18 @@ EventType EventTypeFromNative(const base::NativeEvent& native_event) { |
| return ET_UMA_DATA; |
| if (GetButtonMaskForX2Event(xievent)) |
| return ET_MOUSE_DRAGGED; |
| + |
| + XIDeviceEvent* xievent = |
| + static_cast<XIDeviceEvent*>(native_event->xcookie.data); |
| + |
|
sadrul
2015/05/26 17:52:51
|xievent| is already defined (line 403). So this i
tdresser
2015/05/27 12:49:39
Thanks.
Done.
|
| + if (DeviceDataManagerX11::GetInstance()->HasEventData( |
| + xievent, DeviceDataManagerX11::DT_CMT_SCROLL_X) || |
| + DeviceDataManagerX11::GetInstance()->HasEventData( |
| + xievent, DeviceDataManagerX11::DT_CMT_SCROLL_Y)) { |
| + // Don't produce mouse move events for mousewheel scrolls. |
| + return ET_UNKNOWN; |
| + } |
| + |
| return ET_MOUSE_MOVED; |
| } |
| case XI_KeyPress: |