diff options
| author | sheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 06:46:21 +0000 |
|---|---|---|
| committer | sheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 06:46:21 +0000 |
| commit | c754875e2ea7ac0e40e9db77375899d7683b21c2 (patch) | |
| tree | 9e26f2a28dd0d34c7c8c3241f40bce05e85af48b /ui/base/x/x11_util.cc | |
| parent | 901e511640a9b97a8e711d0caa578fc9810b2541 (diff) | |
| download | chromium_src-c754875e2ea7ac0e40e9db77375899d7683b21c2.zip chromium_src-c754875e2ea7ac0e40e9db77375899d7683b21c2.tar.gz chromium_src-c754875e2ea7ac0e40e9db77375899d7683b21c2.tar.bz2 | |
Merge CMTEventData and ValuatorTracker
The patch merges the CMTEventData class in event_x.cc with the ValuatorTracker
class into an unified class DeviceDataManager that deals with all X valuator
data extraction tasks. It provides new APIs for checking X event types,
extracting values from X valuators and more. It currently handles mouses,
touchpads and touchscreens.
Contributed by sheckylin@chromium.org
BUG=244253
TEST=Tested on device.
Change-Id: I19208c876a4da6865a86a540bff36db32997bfe0
Review URL: https://chromiumcodereview.appspot.com/15705004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206336 0039d316-1c4b-4281-b951-d872f2087c98
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 |