diff options
Diffstat (limited to 'ui/base/x/x11_util.cc')
| -rw-r--r-- | ui/base/x/x11_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index 5034ea1..4d06195 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -35,7 +35,7 @@ #include "ui/base/events/event_utils.h" #include "ui/base/keycodes/keyboard_code_conversion_x.h" #include "ui/base/touch/touch_factory_x11.h" -#include "ui/base/x/valuators.h" +#include "ui/base/x/device_data_manager.h" #include "ui/base/x/x11_util_internal.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/rect.h" @@ -520,8 +520,8 @@ int CoalescePendingMotionEvents(const XEvent* xev, if (next_event.type == GenericEvent && next_event.xgeneric.evtype == event_type && - !ui::GetScrollOffsets(&next_event, NULL, NULL, NULL, NULL, NULL) && - !ui::GetFlingData(&next_event, NULL, NULL, NULL, NULL, NULL)) { + !ui::DeviceDataManager::GetInstance()->IsCMTGestureEvent( + &next_event)) { XIDeviceEvent* next_xievent = static_cast<XIDeviceEvent*>(next_event.xcookie.data); // Confirm that the motion event is targeted at the same window |