Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: ui/events/devices/x11/device_data_manager_x11.h

Issue 1147293002: Stop dispatching mouse move events for wheel scrolling in X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address sadrul's comments. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/x11/device_data_manager_x11.h
diff --git a/ui/events/devices/x11/device_data_manager_x11.h b/ui/events/devices/x11/device_data_manager_x11.h
index 71b752b637a7880d2cdc5ee1ecbf8b5adae069a0..c8e29f54600a34a84ad48bdeefedf092b475fbc5 100644
--- a/ui/events/devices/x11/device_data_manager_x11.h
+++ b/ui/events/devices/x11/device_data_manager_x11.h
@@ -125,6 +125,9 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
// no slot can be found.
bool GetSlotNumber(const XIDeviceEvent* xiev, int* slot);
+ // Check if an XI event contains data of the specified type.
+ bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
+
// Get all event data in one pass. We extract only data types that we know
// about (defined in enum DataType). The data is not processed (e.g. not
// filled in by cached values) as in GetEventData.
@@ -220,7 +223,8 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
// the actual device info, but rather inits the relevant valuator structures
// to have safe default values for testing.
void SetDeviceListForTest(const std::vector<int>& touchscreen,
- const std::vector<int>& cmt_devices);
+ const std::vector<int>& cmt_devices,
+ const std::vector<int>& other_devices);
void SetValuatorDataForTest(XIDeviceEvent* xievent,
DataType type,
@@ -255,9 +259,6 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
// Initialize the XInput related system information.
bool InitializeXInputInternal();
- // Check if an XI event contains data of the specified type.
- bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
-
void InitializeValuatorsForTest(int deviceid,
int start_valuator,
int end_valuator,
« no previous file with comments | « no previous file | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698