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

Unified Diff: ui/base/touch/touch_factory.cc

Issue 9307059: Disable XI2.0 multi-touch support in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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/base/touch/touch_factory.cc
diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory.cc
index b636ea05d7b444ccd651ee73b1a47fc592391a51..c57c95ecf9526f836bf44379292cc3c27815a1c6 100644
--- a/ui/base/touch/touch_factory.cc
+++ b/ui/base/touch/touch_factory.cc
@@ -437,13 +437,14 @@ void TouchFactory::SetupValuator() {
// In order to support multi-touch with XI2.0, we need both a slot_id and
// tracking_id valuator. Without these we'll treat the device as a
// single-touch device (like a mouse).
- if (valuator_lookup_[info->deviceid][TP_SLOT_ID] == -1 ||
- valuator_lookup_[info->deviceid][TP_TRACKING_ID] == -1) {
+ // TODO(rbyers): Multi-touch is disabled: http://crbug.com/112329
+ //if (valuator_lookup_[info->deviceid][TP_SLOT_ID] == -1 ||
+ // valuator_lookup_[info->deviceid][TP_TRACKING_ID] == -1) {
DVLOG(1) << "Touch device " << info->deviceid <<
" does not provide enough information for multi-touch, treating as "
"a single-touch device.";
touch_device_list_[info->deviceid] = false;
- }
+ //}
#endif
}
« 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