diff options
| author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 22:11:32 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 22:11:32 +0000 |
| commit | 60d0673db91e7805394654019217319b7849ea56 (patch) | |
| tree | 04fb770f376845187898209cfefd8223def30bc7 /ui | |
| parent | 7e356e88c48c67b29705c53b371f1871277b805c (diff) | |
| download | chromium_src-60d0673db91e7805394654019217319b7849ea56.zip chromium_src-60d0673db91e7805394654019217319b7849ea56.tar.gz chromium_src-60d0673db91e7805394654019217319b7849ea56.tar.bz2 | |
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
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/touch/touch_factory.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory.cc index f2faf1d..cae979a 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 } |