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

Unified Diff: ui/events/ozone/evdev/event_device_info.h

Issue 671723002: [Ozone] Properly initialize multitouch slot values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 2 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
Index: ui/events/ozone/evdev/event_device_info.h
diff --git a/ui/events/ozone/evdev/event_device_info.h b/ui/events/ozone/evdev/event_device_info.h
index 321711404d5c23c66cc8d347f1840e976b78bb60..e00b6eb5418349cc5eea83548e648bb758583ff4 100644
--- a/ui/events/ozone/evdev/event_device_info.h
+++ b/ui/events/ozone/evdev/event_device_info.h
@@ -12,6 +12,9 @@
#include "ui/events/ozone/evdev/event_device_util.h"
#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+// ABS_MT_SLOT isn't valid options for EVIOCGMTSLOTS ioctl.
+#define ABS_MT_COUNT (ABS_MT_TOOL_Y - ABS_MT_SLOT)
spang 2014/10/21 19:38:36 This looks deceptively like something that comes f
dnicoara 2014/10/21 20:32:12 Done.
+
namespace ui {
// Device information for Linux input devices
@@ -38,6 +41,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventDeviceInfo {
// Properties of absolute axes.
int32 GetAbsMinimum(unsigned int code) const;
int32 GetAbsMaximum(unsigned int code) const;
+ int32 GetSlotValue(unsigned int code, unsigned int slot) const;
// Check input device properties.
bool HasProp(unsigned int code) const;
@@ -64,6 +68,9 @@ class EVENTS_OZONE_EVDEV_EXPORT EventDeviceInfo {
struct input_absinfo abs_info_[ABS_CNT];
+ // Store the values for the multi-touch properties for each slot.
+ int32_t* slot_values_[ABS_MT_COUNT];
+
DISALLOW_COPY_AND_ASSIGN(EventDeviceInfo);
};
« no previous file with comments | « no previous file | ui/events/ozone/evdev/event_device_info.cc » ('j') | ui/events/ozone/evdev/event_device_info.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698