summaryrefslogtreecommitdiffstats
path: root/views/touchui
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 20:11:11 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 20:11:11 +0000
commit8e6fcb1fdcfe52188fd84a90b4c3f00215814b8c (patch)
tree2250b62102836804d96ff92da42a62364e6ea783 /views/touchui
parentf3ceb2944886b2bc5d664e8b066e213f4fef49e3 (diff)
downloadchromium_src-8e6fcb1fdcfe52188fd84a90b4c3f00215814b8c.zip
chromium_src-8e6fcb1fdcfe52188fd84a90b4c3f00215814b8c.tar.gz
chromium_src-8e6fcb1fdcfe52188fd84a90b4c3f00215814b8c.tar.bz2
xi2: We need to look at the slave device that generated the event,
instead of the master device to determine if we should process the event or not. BUG=none TEST=test that there is only one mousedown event for a mouseclick Review URL: http://codereview.chromium.org/7232022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/touchui')
-rw-r--r--views/touchui/touch_factory.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/touchui/touch_factory.cc b/views/touchui/touch_factory.cc
index 772e47e..2f3506f 100644
--- a/views/touchui/touch_factory.cc
+++ b/views/touchui/touch_factory.cc
@@ -228,7 +228,7 @@ bool TouchFactory::ShouldProcessXI2Event(XEvent* xev) {
return true;
XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(cookie->data);
- return pointer_device_lookup_[xiev->sourceid];
+ return pointer_device_lookup_[xiev->deviceid];
}
void TouchFactory::SetupXI2ForXWindow(Window window) {