Merge 270252 "Re-land "Move touch CTM from X into Chrome""

ui/events/x/events_x.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/event_constants.h"
 
 #include <cmath>
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 445 matching lines @@
     case LeaveNotify:
       return gfx::Point(native_event->xcrossing.x, native_event->xcrossing.y);
     case ButtonPress:
     case ButtonRelease:
       return gfx::Point(native_event->xbutton.x, native_event->xbutton.y);
     case MotionNotify:
       return gfx::Point(native_event->xmotion.x, native_event->xmotion.y);
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
-      return gfx::Point(static_cast<int>(xievent->event_x),
-                        static_cast<int>(xievent->event_y));
+      float x = xievent->event_x;
+      float y = xievent->event_y;
+#if defined(OS_CHROMEOS)
+      switch (xievent->evtype) {
+        case XI_TouchBegin:
+        case XI_TouchUpdate:
+        case XI_TouchEnd:
+          ui::DeviceDataManager::GetInstance()->ApplyTouchTransformer(
+              xievent->deviceid, &x, &y);
+          break;
+        default:
+          break;
+      }
+#endif  // defined(OS_CHROMEOS)
+      return gfx::Point(static_cast<int>(x), static_cast<int>(y));
     }
   }
   return gfx::Point();
 }
 
 gfx::Point EventSystemLocationFromNative(
     const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case EnterNotify:
     case LeaveNotify: {
@@ skipping 228 matching lines @@
   DeviceDataManager::GetInstance()->GetGestureTimes(
       native_event, start_time, end_time);
   return true;
 }
 
 bool IsTouchpadEvent(const base::NativeEvent& event) {
   return DeviceDataManager::GetInstance()->IsTouchpadXInputEvent(event);
 }
 
 }  // namespace ui