summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 22:42:15 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 22:42:15 +0000
commit60030f8e4b9b71ae55c55ca5c5cfbb3944739f6d (patch)
tree6c8d73f7ebeedffaa95a08f99ffab3b3ca29eefe /ui/aura
parenta9b198bb87cf6f32fd2b1c61ee2000fd67884ffc (diff)
downloadchromium_src-60030f8e4b9b71ae55c55ca5c5cfbb3944739f6d.zip
chromium_src-60030f8e4b9b71ae55c55ca5c5cfbb3944739f6d.tar.gz
chromium_src-60030f8e4b9b71ae55c55ca5c5cfbb3944739f6d.tar.bz2
aura: Re-enable XInput2 events.
It turns out that the position information in an event for a slave device reported by X is always slightly behind than the actual position. However, it turns out that the valuators do contain the correct information. So get the event location from the valuator. BUG=103981 TEST=manually Review URL: http://codereview.chromium.org/8568044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/desktop_host_linux.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/aura/desktop_host_linux.cc b/ui/aura/desktop_host_linux.cc
index 2de31e6..46492cf 100644
--- a/ui/aura/desktop_host_linux.cc
+++ b/ui/aura/desktop_host_linux.cc
@@ -281,11 +281,8 @@ DesktopHostLinux::DesktopHostLinux(const gfx::Rect& bounds)
XSelectInput(xdisplay_, xwindow_, event_mask);
XFlush(xdisplay_);
- // TODO(sadrul): reenable once 103981 is fixed.
-#if defined(TOUCH_UI)
if (base::MessagePumpForUI::HasXInput2())
ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
-#endif
}
DesktopHostLinux::~DesktopHostLinux() {