Move touch CTM from X into Chrome

ui/aura/window_tree_host_x11.cc

Index: ui/aura/window_tree_host_x11.cc
diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc
index 5fec30cff62fda35b1975630facf2dfe77f50c88..e6445813853b34adce804403e655a92e8faff182 100644
--- a/ui/aura/window_tree_host_x11.cc
+++ b/ui/aura/window_tree_host_x11.cc
@@ -499,6 +499,7 @@ ui::EventProcessor* WindowTreeHostX11::GetEventProcessor() {
 void WindowTreeHostX11::DispatchXI2Event(const base::NativeEvent& event) {
   ui::TouchFactory* factory = ui::TouchFactory::GetInstance();
   XEvent* xev = event;
+  XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
   if (!factory->ShouldProcessXI2Event(xev))
     return;
 
@@ -516,19 +517,9 @@ void WindowTreeHostX11::DispatchXI2Event(const base::NativeEvent& event) {
     case ui::ET_TOUCH_PRESSED:
     case ui::ET_TOUCH_CANCELLED:
     case ui::ET_TOUCH_RELEASED: {
-#if defined(OS_CHROMEOS)
-      // Bail out early before generating a ui::TouchEvent if this event
-      // is not within the range of this RootWindow. Converting an xevent
-      // to ui::TouchEvent might change the state of the global touch tracking
-      // state, e.g. touch release event can remove the touch id from the
-      // record, and doing this multiple time when there are multiple
-      // RootWindow will cause problem. So only generate the ui::TouchEvent
-      // when we are sure it belongs to this RootWindow.
-      if (base::SysInfo::IsRunningOnChromeOS() &&
-          !bounds().Contains(ui::EventLocationFromNative(xev)))
-        return;
-#endif
       ui::TouchEvent touchev(xev);

[oshima, 2014/05/06 01:47:57]

I vaguely remember that creating TouchEvent before checking if it can be
dispatched caused a failure in a test. Maybe you have already taken care of it,
but wanted to mention it just in case.

+      ui::DeviceDataManager::GetInstance()->CalibrateTouchEvent(
+          &touchev, xiev->deviceid, bounds_);
       TranslateAndDispatchLocatedEvent(&touchev);
       break;
     }