ozone: Map TouchEvent::touch_id_ into expected range

ui/events/ozone/evdev/event_factory_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/event_factory_evdev.h"
 
 #include "base/bind.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/input_controller_evdev.h"
 #include "ui/events/ozone/evdev/input_device_factory_evdev.h"
 #include "ui/events/ozone/evdev/input_device_factory_evdev_proxy.h"
 #include "ui/events/ozone/evdev/input_injector_evdev.h"
+#include "ui/events/ozone/evdev/touch_evdev_types.h"
 
 namespace ui {
 
 namespace {
 
 // Thread safe dispatcher proxy for EventFactoryEvdev.
 //
 // This is used on the device I/O thread for dispatching to UI.
 class ProxyDeviceEventDispatcher : public DeviceEventDispatcherEvdev {
  public:
@@ skipping 81 matching lines @@
                                      KeyboardLayoutEngine* keyboard_layout)
     : last_device_id_(0),
       device_manager_(device_manager),
       keyboard_(&modifiers_,
                 keyboard_layout,
                 base::Bind(&EventFactoryEvdev::DispatchUiEvent,
                            base::Unretained(this))),
       cursor_(cursor),
       input_controller_(&keyboard_, &button_map_),
       initialized_(false),
+      touch_id_generator_(0),
       weak_ptr_factory_(this) {
   DCHECK(device_manager_);
 }
 
 EventFactoryEvdev::~EventFactoryEvdev() {
 }
 
 void EventFactoryEvdev::Init() {
   DCHECK(!initialized_);
 
@@ skipping 90 matching lines @@
   double radius_y = params.radii.y();
 
   // Transform the event to align touches to the image based on display mode.
   DeviceDataManager::GetInstance()->ApplyTouchTransformer(params.device_id, &x,
                                                           &y);
   DeviceDataManager::GetInstance()->ApplyTouchRadiusScale(params.device_id,
                                                           &radius_x);
   DeviceDataManager::GetInstance()->ApplyTouchRadiusScale(params.device_id,
                                                           &radius_y);
 
+  // params.slot is guaranteed to be < kNumTouchEvdevSlots.
+  int touch_id = touch_id_generator_.GetGeneratedID(
+      params.device_id * kNumTouchEvdevSlots + params.slot);
   TouchEvent touch_event(params.type, gfx::PointF(x, y),
-                         modifiers_.GetModifierFlags(), params.touch_id,
+                         modifiers_.GetModifierFlags(), touch_id,
                          params.timestamp, radius_x, radius_y,
                          /* angle */ 0.f, params.pressure);
   touch_event.set_source_device_id(params.device_id);
   DispatchUiEvent(&touch_event);
+
+  if (params.type == ET_TOUCH_RELEASED || params.type == ET_TOUCH_CANCELLED) {
+    touch_id_generator_.ReleaseGeneratedID(touch_event.touch_id());
+  }
 }
 
 void EventFactoryEvdev::DispatchUiEvent(Event* event) {
   // DispatchEvent takes PlatformEvent which is void*. This function
   // wraps it with the real type.
   DispatchEvent(event);
 }
 
 void EventFactoryEvdev::DispatchKeyboardDevicesUpdated(
     const std::vector<KeyboardDevice>& devices) {
@@ skipping 83 matching lines @@
 
   // Hook up device configuration.
   input_controller_.SetInputDeviceFactory(input_device_factory_proxy_.get());
 
   // Scan & monitor devices.
   device_manager_->AddObserver(this);
   device_manager_->ScanDevices(this);
 }
 
 }  // namespace ui