Extract touchscreen device management into a generic manager

ui/events/device_data_manager.cc

Index: ui/events/device_data_manager.cc
diff --git a/ui/events/device_data_manager.cc b/ui/events/device_data_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..04e6659c65a51665085751259b3f1b75fed777d8
--- /dev/null
+++ b/ui/events/device_data_manager.cc
@@ -0,0 +1,67 @@
+// 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/device_data_manager.h"
+
+#include "base/memory/singleton.h"
+#include "ui/gfx/display.h"
+#include "ui/gfx/geometry/point3_f.h"
+
+namespace ui {
+
+DeviceDataManager::DeviceDataManager() {
+  for (int i = 0; i < kMaxDeviceNum; ++i)
+    touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
+}
+
+DeviceDataManager::~DeviceDataManager() {}
+
+#if !defined(USE_X11)
+// static
+DeviceDataManager* DeviceDataManager::GetInstance() {

[sadrul, 2014/05/27 15:50:21]

Can we change this to be more like how PlatformEventSource::GetInstance() works?

You will probably need to explicitly initialize DeviceDataManager somewhere
(looks like we don't do that at the moment, unfortunately).

+  return Singleton<DeviceDataManager>::get();
+}
+#endif
+
+void DeviceDataManager::ClearTouchTransformerRecord() {
+  for (int i = 0; i < kMaxDeviceNum; i++) {
+    touch_device_transformer_map_[i] = gfx::Transform();
+    touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
+  }
+}
+
+bool DeviceDataManager::IsTouchDeviceIdValid(int touch_device_id) const {
+  return (touch_device_id > 0 && touch_device_id < kMaxDeviceNum);
+}
+
+void DeviceDataManager::UpdateTouchInfoForDisplay(
+    int64_t display_id,
+    int touch_device_id,
+    const gfx::Transform& touch_transformer) {
+  if (IsTouchDeviceIdValid(touch_device_id)) {
+    touch_device_to_display_map_[touch_device_id] = display_id;
+    touch_device_transformer_map_[touch_device_id] = touch_transformer;
+  }
+}
+
+void DeviceDataManager::ApplyTouchTransformer(int touch_device_id,
+                                              float* x,
+                                              float* y) {
+  if (IsTouchDeviceIdValid(touch_device_id)) {
+    gfx::Point3F point(*x, *y, 0.0);
+    const gfx::Transform& trans =
+        touch_device_transformer_map_[touch_device_id];
+    trans.TransformPoint(&point);
+    *x = point.x();
+    *y = point.y();
+  }
+}
+
+int64_t DeviceDataManager::GetDisplayForTouchDevice(int touch_device_id) const {
+  if (IsTouchDeviceIdValid(touch_device_id))
+    return touch_device_to_display_map_[touch_device_id];
+  return gfx::Display::kInvalidDisplayID;
+}
+
+}  // namespace ui