Extract touchscreen device management into a generic manager

ui/events/x/device_data_manager_x11.h

 // Copyright 2013 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.
 
-#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,
 // which makes Bool unrecognized in XInput2.h.
 #ifndef Bool
 #define Bool int
 #endif
 
 #include <X11/extensions/XInput2.h>
 
 #include <bitset>
 #include <map>
 #include <vector>
 
 #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 {
 
 // CrOS touchpad metrics gesture types
 enum GestureMetricsType {
   kGestureMetricsTypeNoisyGround = 0,
   kGestureMetricsTypeUnknown,
 };
 
 // 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,
   // make sure to update the kCachedAtoms data structure in the source file
   // and the k*Type[Start/End] constants used by IsCMTDataType and
   // IsTouchDataType.
   enum DataType {
     // Define the valuators used the CrOS CMT driver. Used by mice and CrOS
     // touchpads.
     DT_CMT_SCROLL_X = 0,  // Scroll amount on the X (horizontal) direction.
@@ skipping 38 matching lines @@
     DT_TOUCH_RAW_TIMESTAMP,
 
     // End of touch data types.
 
     DT_LAST_ENTRY         // This must come last.
   };
 
   // Data struct to store extracted data from an input event.
   typedef std::map<int, double> EventData;
 
+  static void CreateInstance();
+
   // 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;
 
   // Updates the list of devices.
   void UpdateDeviceList(Display* display);
 
   // For multitouch events we use slot number to distinguish touches from
   // different fingers. This function returns true if the associated slot
   // for |xiev| can be found and it is saved in |slot|, returns false if
@@ skipping 94 matching lines @@
   // This function is only for test purpose. It does not query the X server for
   // the actual device info, but rather inits the relevant valuator structures
   // to have safe default values for testing.
   void SetDeviceListForTest(const std::vector<unsigned int>& touchscreen,
                             const std::vector<unsigned int>& cmt_devices);
 
   void SetValuatorDataForTest(XIDeviceEvent* xievent,
                               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();
+  DeviceDataManagerX11();
+  virtual ~DeviceDataManagerX11();
 
   // Initialize the XInput related system information.
   bool InitializeXInputInternal();
 
   // Check if an XI event contains data of the specified type.
   bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
 
   void InitializeValuatorsForTest(int deviceid,
                                   int start_valuator,
                                   int end_valuator,
                                   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;
 
   // Major opcode for the XInput extension. Used to identify XInput events.
   int xi_opcode_;
 
   // A quick lookup table for determining if the XI event is an XIDeviceEvent.
   std::bitset<kMaxXIEventType> xi_device_event_types_;
 
   // A quick lookup table for determining if events from the pointer device
@@ skipping 25 matching lines @@
   // doesn't think X/device doesn't know about the valuators. We currently
   // use this only on touchscreen devices.
   std::vector<double> last_seen_valuator_[kMaxDeviceNum][kMaxSlotNum];
 
   // X11 atoms cache.
   X11AtomCache atom_cache_;
 
   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_