Commit 60d0673d authored by rbyers@chromium.org's avatar rbyers@chromium.org

Disable XI2.0 multi-touch support in Aura

There are a bunch of issues with multi-touch support (crbug.com/112329).  In order to unblock basic touch functionality quickly, I'm disabling multi-touch for now.

BUG=111646
TEST=


Review URL: http://codereview.chromium.org/9307059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120837 0039d316-1c4b-4281-b951-d872f2087c98
parent 7e356e88
...@@ -437,13 +437,14 @@ void TouchFactory::SetupValuator() { ...@@ -437,13 +437,14 @@ void TouchFactory::SetupValuator() {
// In order to support multi-touch with XI2.0, we need both a slot_id and // 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 // tracking_id valuator. Without these we'll treat the device as a
// single-touch device (like a mouse). // single-touch device (like a mouse).
if (valuator_lookup_[info->deviceid][TP_SLOT_ID] == -1 || // TODO(rbyers): Multi-touch is disabled: http://crbug.com/112329
valuator_lookup_[info->deviceid][TP_TRACKING_ID] == -1) { //if (valuator_lookup_[info->deviceid][TP_SLOT_ID] == -1 ||
// valuator_lookup_[info->deviceid][TP_TRACKING_ID] == -1) {
DVLOG(1) << "Touch device " << info->deviceid << DVLOG(1) << "Touch device " << info->deviceid <<
" does not provide enough information for multi-touch, treating as " " does not provide enough information for multi-touch, treating as "
"a single-touch device."; "a single-touch device.";
touch_device_list_[info->deviceid] = false; touch_device_list_[info->deviceid] = false;
} //}
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment