[PATCH 1/11] ozone: evdev: Move touch ui::Event transformation to EventFactoryEvdev

ui/events/ozone/evdev/touch_event_converter_evdev.cc

 // Copyright 2014 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/ozone/evdev/touch_event_converter_evdev.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <poll.h>
@@ skipping 56 matching lines @@
       radius_x_(0),
       radius_y_(0),
       pressure_(0) {
 }
 
 TouchEventConverterEvdev::TouchEventConverterEvdev(
     int fd,
     base::FilePath path,
     int id,
     InputDeviceType type,
-    const EventDispatchCallback& callback)
+    const TouchEventDispatchCallback& touch_callback)
     : EventConverterEvdev(fd, path, id, type),
-      callback_(callback),
+      touch_callback_(touch_callback),
       syn_dropped_(false),
       is_type_a_(false),
       current_slot_(0) {
 }
 
 TouchEventConverterEvdev::~TouchEventConverterEvdev() {
   Stop();
   close(fd_);
 }
 
@@ skipping 173 matching lines @@
       // Some buffer has overrun. We ignore all events up to and
       // including the next SYN_REPORT.
       syn_dropped_ = true;
       break;
     default:
       NOTIMPLEMENTED() << "invalid code for EV_SYN: " << input.code;
   }
 }
 
 void TouchEventConverterEvdev::ReportEvent(int touch_id,
-    const InProgressEvents& event, const base::TimeDelta& delta) {
-  float x = event.x_;
-  float y = event.y_;
-
-  double radius_x = event.radius_x_;
-  double radius_y = event.radius_y_;
-
-  // Transform the event according (this is used to align touches
-  // to the image based on display mode).
-  DeviceDataManager::GetInstance()->ApplyTouchTransformer(
-      id_, &x, &y);
-  DeviceDataManager::GetInstance()->ApplyTouchRadiusScale(
-      id_, &radius_x);
-  DeviceDataManager::GetInstance()->ApplyTouchRadiusScale(
-      id_, &radius_y);
-
-  gfx::PointF location(x, y);
-
-  scoped_ptr<TouchEvent> touch_event(
-      new TouchEvent(event.type_, location,
-                     /* flags */ 0,
-                     /* touch_id */ touch_id,
-                     delta,
-                     /* radius_x */ radius_x,
-                     /* radius_y */ radius_y,
-                     /* angle */ 0.,
-                     event.pressure_));
-  touch_event->set_source_device_id(id_);
-  callback_.Run(touch_event.Pass());
+                                           const InProgressEvents& event,
+                                           const base::TimeDelta& timestamp) {
+  touch_callback_.Run(TouchEventParams(
+      id_, touch_id, event.type_, gfx::PointF(event.x_, event.y_),
+      gfx::Vector2dF(event.radius_x_, event.radius_y_), event.pressure_,
+      timestamp));
 }
 
 void TouchEventConverterEvdev::ReportEvents(base::TimeDelta delta) {
   for (int i = 0; i < MAX_FINGERS; i++) {
     if (altered_slots_[i]) {
       ReportEvent(i, events_[i], delta);
 
       // Subsequent events for this finger will be touch-move until it
       // is released.
       events_[i].type_ = ET_TOUCH_MOVED;
     }
   }
   altered_slots_.reset();
 }
 
 }  // namespace ui