Extract touchscreen device management into a generic manager

ui/events/x/device_data_manager_x11.h

Index: ui/events/x/device_data_manager_x11.h
diff --git a/ui/events/x/device_data_manager.h b/ui/events/x/device_data_manager_x11.h
similarity index 90%
rename from ui/events/x/device_data_manager.h
rename to ui/events/x/device_data_manager_x11.h
index 1135ec222b89ee5d491f5fae7e130aced0c64bc2..d10251e687ab916f153805a9c9f37fcc16b2a671 100644
--- a/ui/events/x/device_data_manager.h
+++ b/ui/events/x/device_data_manager_x11.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_EVENTS_X_DEVICE_DATA_MANAGER_H_
-#define UI_EVENTS_X_DEVICE_DATA_MANAGER_H_
+#ifndef UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
+#define UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
 
 // Generically-named #defines from Xlib is conflicting with symbols in GTest.
 // So many tests .cc file #undef Bool before including device_data_manager.h,
@@ -21,15 +21,13 @@
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/events/device_data_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/events_base_export.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/transform.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 
-template <typename T> struct DefaultSingletonTraits;
-
 typedef union _XEvent XEvent;
 
 namespace ui {
@@ -42,7 +40,7 @@ enum GestureMetricsType {
 
 // A class that extracts and tracks the input events data. It currently handles
 // mouse, touchpad and touchscreen devices.
-class EVENTS_BASE_EXPORT DeviceDataManager {
+class EVENTS_BASE_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
  public:
   // Enumerate additional data that one might be interested on an input event,
   // which are usually wrapped in X valuators. If you modify any of this,
@@ -101,12 +99,15 @@ class EVENTS_BASE_EXPORT DeviceDataManager {
   // Data struct to store extracted data from an input event.
   typedef std::map<int, double> EventData;
 
+  DeviceDataManagerX11();
+  virtual ~DeviceDataManagerX11();

[sadrul, 2014/06/16 14:48:38]

Make these private (because otherwise any number of DDMX11 can be created). Have
a DDMX11::CreateInstance() for creating it.

[dnicoara, 2014/06/16 15:13:56]

The CHECK in DDM's constructor would prevent that.

[sadrul, 2014/06/17 20:37:08]

Making them private would make this easier to understand when reading the code.

[dnicoara, 2014/06/18 14:04:29]

Done

+
   // We use int because enums can be casted to ints but not vice versa.
   static bool IsCMTDataType(const int type);
   static bool IsTouchDataType(const int type);
 
-  // Returns the DeviceDataManager singleton.
-  static DeviceDataManager* GetInstance();
+  // Returns the DeviceDataManagerX11 singleton.
+  static DeviceDataManagerX11* GetInstance();
 
   // Returns if XInput2 is available on the system.
   bool IsXInput2Available() const;
@@ -221,21 +222,9 @@ class EVENTS_BASE_EXPORT DeviceDataManager {
                               DataType type,
                               double value);
 
-  void ClearTouchTransformerRecord();
-  void UpdateTouchInfoForDisplay(int64 display_id,
-                                 int touch_device_id,
-                                 const gfx::Transform& touch_transformer);
-  void ApplyTouchTransformer(int touch_device_id, float* x, float* y);
-  int64 GetDisplayForTouchDevice(int touch_device_id) const;
   bool TouchEventNeedsCalibrate(int touch_device_id) const;
 
  private:
-  // Requirement for Singleton.
-  friend struct DefaultSingletonTraits<DeviceDataManager>;
-
-  DeviceDataManager();
-  ~DeviceDataManager();
-
   // Initialize the XInput related system information.
   bool InitializeXInputInternal();
 
@@ -248,9 +237,6 @@ class EVENTS_BASE_EXPORT DeviceDataManager {
                                   double min_value,
                                   double max_value);
 
-  bool IsTouchDeviceIdValid(int touch_device_id) const;
-
-  static const int kMaxDeviceNum = 128;
   static const int kMaxXIEventType = XI_LASTEVENT + 1;
   static const int kMaxSlotNum = 10;
 
@@ -296,14 +282,9 @@ class EVENTS_BASE_EXPORT DeviceDataManager {
   unsigned char button_map_[256];
   int button_map_count_;
 
-  // Table to keep track of which display id is mapped to which touch device.
-  int64 touch_device_to_display_map_[kMaxDeviceNum];
-  // Index table to find the TouchTransformer for a touch device.
-  gfx::Transform touch_device_transformer_map_[kMaxDeviceNum];
-
-  DISALLOW_COPY_AND_ASSIGN(DeviceDataManager);
+  DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
 };
 
 }  // namespace ui
 
-#endif  // UI_EVENTS_X_DEVICE_DATA_MANAGER_H_
+#endif  // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_