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

Unified Diff: ui/events/devices/x11/touch_factory_x11.cc

Issue 1047733003: Make the Mouse integration work in Virtualbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/x11/touch_factory_x11.cc
diff --git a/ui/events/devices/x11/touch_factory_x11.cc b/ui/events/devices/x11/touch_factory_x11.cc
index dc26db5cd0b61f62d265084272895686b1402d87..53aa4b12a3dbd9d644f84200b08ac24d1d76db5d 100644
--- a/ui/events/devices/x11/touch_factory_x11.cc
+++ b/ui/events/devices/x11/touch_factory_x11.cc
@@ -83,22 +83,9 @@ void TouchFactory::UpdateDeviceList(Display* display) {
touch_device_list_.clear();
touchscreen_ids_.clear();
- // NOTE: The new API for retrieving the list of devices (XIQueryDevice) does
- // not provide enough information to detect a touch device. As a result, the
- // old version of query function (XListInputDevices) is used instead.
- // If XInput2 is not supported, this will return null (with count of -1) so
- // we assume there cannot be any touch devices.
+ // NOTE: If XInput2 is not supported, this will return null (with count of
+ // -1) so we assume there cannot be any touch devices.
// With XI2.1 or older, we allow only single touch devices.
sadrul 2015/03/30 21:19:00 Not sure what you mean by 'this will return null'.
lanwei 2015/03/30 21:36:28 I mean the two lists, touch_device_lookup_, touch_
- const XDeviceList& dev_list =
- DeviceListCacheX11::GetInstance()->GetXDeviceList(display);
- Atom xi_touchscreen = XInternAtom(display, XI_TOUCHSCREEN, false);
- for (int i = 0; i < dev_list.count; i++) {
- if (dev_list[i].type == xi_touchscreen) {
- touch_device_lookup_[dev_list[i].id] = true;
- touch_device_list_[dev_list[i].id] = false;
- }
- }
-
if (!DeviceDataManagerX11::GetInstance()->IsXInput2Available())
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698