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

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

Issue 672633002: Revert of [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
« no previous file with comments | « ui/events/ozone/evdev/event_device_info.h ('k') | ui/events/ozone/evdev/touch_event_converter_evdev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/event_device_info.cc
diff --git a/ui/events/ozone/evdev/event_device_info.cc b/ui/events/ozone/evdev/event_device_info.cc
index d9bd17f15f2b4ac72ccf2bf81eb498dbc03ec983..6d75ea9e0c7272cb0726c5052ea41e3e12d9dc19 100644
--- a/ui/events/ozone/evdev/event_device_info.cc
+++ b/ui/events/ozone/evdev/event_device_info.cc
@@ -37,24 +37,6 @@
DLOG(ERROR) << "failed EVIOCGABS(" << code << ") on fd " << fd;
return false;
}
- return true;
-}
-
-// |request| needs to be the equivalent to:
-// struct input_mt_request_layout {
-// uint32_t code;
-// int32_t values[num_slots];
-// };
-//
-// |size| is num_slots + 1 (for code).
-bool GetSlotValues(int fd, int32_t* request, unsigned int size) {
- if (ioctl(fd,
- EVIOCGMTSLOTS(sizeof(int32_t) * size),
- request) < 0) {
- LOG(ERROR) << "failed EVIOCGMTSLOTS(" << request[0] << ") on fd " << fd;
- return false;
- }
-
return true;
}
@@ -103,20 +85,6 @@
if (HasAbsEvent(i))
if (!GetAbsInfo(fd, i, &abs_info_[i]))
return false;
-
- int max_num_slots = abs_info_[ABS_MT_SLOT].maximum + 1;
- // |request| is MT code + slots.
- int32_t request[max_num_slots + 1];
- for (unsigned int i = ABS_MT_SLOT + 1; i < ABS_MAX; ++i) {
- memset(request, 0, sizeof(request));
- request[0] = i;
- if (HasAbsEvent(i))
- if (!GetSlotValues(fd, request, max_num_slots + 1))
- return false;
-
- slot_values_[i - ABS_MT_SLOT - 1].assign(
- request + 1, request + max_num_slots + 1);
- }
return true;
}
@@ -177,14 +145,6 @@
return abs_info_[code].maximum;
}
-int32 EventDeviceInfo::GetSlotValue(unsigned int code,
- unsigned int slot) const {
- const std::vector<int32_t>& slots = GetMtSlotsForCode(code);
- DCHECK_LE(0u, slot) << slot << " is an invalid slot";
- DCHECK_LT(slot, slots.size()) << slot << " is an invalid slot";
- return slots[slot];
-}
-
bool EventDeviceInfo::HasAbsXY() const {
if (HasAbsEvent(ABS_X) && HasAbsEvent(ABS_Y))
return true;
@@ -222,12 +182,4 @@
return true;
}
-const std::vector<int32_t>& EventDeviceInfo::GetMtSlotsForCode(int code) const {
- int index = code - ABS_MT_SLOT - 1;
- DCHECK_LE(0, index) << code << " is not a valid multi-touch code";
- DCHECK_LT(index, EVDEV_ABS_MT_COUNT)
- << code << " is not a valid multi-touch code";
- return slot_values_[index];
-}
-
} // namespace ui
« no previous file with comments | « ui/events/ozone/evdev/event_device_info.h ('k') | ui/events/ozone/evdev/touch_event_converter_evdev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698