Move touch CTM from X into Chrome

ui/events/x/device_data_manager.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_
 
 // 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 "ui/events/event_constants.h"
 #include "ui/events/events_base_export.h"
+#include "ui/events/touch_ctm.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 {
@@ skipping 173 matching lines @@
                      const DataType type,
                      double* value);
 
   // Extract the range of the data type. Return true if the range is available
   // and written into min & max, false if the range is not available.
   bool GetDataRange(unsigned int deviceid,
                     const DataType type,
                     double* min,
                     double* max);
 
+  void ClearTouchCTM();

[sadrul, 2014/03/15 19:32:51]

Use something more descriptive than CTM

[Yufeng Shen (Slow to review), 2014/04/29 20:34:18]

renamed to TouchTransformer.

+  void SetTouchCTM(int touch_device_id,
+                   const TouchCTM& touch_ctm);
+  void ApplyTouchCTM(int touch_device_id, float* x, float* y);
+
+  void ClearTouchDeviceToDisplayMap();

[sadrul, 2014/03/15 19:32:51]

We should have one 'Clear<...>' instead of two separate 'Clear<...>'s

[Yufeng Shen (Slow to review), 2014/04/29 20:34:18]

Done.

+  void MapTouchDeviceToDisplay(int touch_device_id, int64 display_id);
+  int64 GetDisplayForTouchDevice(int touch_device_id);
+
+
   // Sets up relevant valuator informations for device ids in the device lists.
   // 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);
@@ skipping 57 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 TouchCTM for a touch device.
+  TouchCTM touch_device_ctm_map_[kMaxDeviceNum];
+
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_X_DEVICE_DATA_MANAGER_H_