Move touch CTM from X into Chrome

chromeos/display/output_configurator.h

Index: chromeos/display/output_configurator.h
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h
index b063caa11571f3f1d3e90fd3d3cf25bb9b2ffb38..641634013cf96614f3b445176efb6531fe22456f 100644
--- a/chromeos/display/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -50,16 +50,6 @@ class CHROMEOS_EXPORT OutputConfigurator
 
   typedef std::map<RRMode, ModeInfo> ModeInfoMap;
 
-  struct CoordinateTransformation {
-    // Initialized to the identity transformation.
-    CoordinateTransformation();
-
-    float x_scale;
-    float x_offset;
-    float y_scale;
-    float y_offset;
-  };
-
   // Information about an output's current state.
   struct OutputSnapshot {
     OutputSnapshot();
@@ -102,8 +92,6 @@ class CHROMEOS_EXPORT OutputConfigurator
     // XInput device ID or 0 if this output isn't a touchscreen.
     int touch_device_id;
 
-    CoordinateTransformation transform;
-
     // Display id for this output.
     int64 display_id;
 
@@ -167,14 +155,6 @@ class CHROMEOS_EXPORT OutputConfigurator
     // is detected, its id will be stored in this output.
     virtual void AssociateTouchscreens(
         std::vector<OutputSnapshot>* outputs) = 0;
-
-    // Configures XInput's Coordinate Transformation Matrix property.
-    // |touch_device_id| the ID of the touchscreen device to configure.
-    // |ctm| contains the desired transformation parameters.  The offsets
-    // in it should be normalized so that 1 corresponds to the X or Y axis
-    // size for the corresponding offset.
-    virtual void ConfigureCTM(int touch_device_id,
-                              const CoordinateTransformation& ctm) = 0;
   };
 
   // Helper class used by tests.
@@ -226,6 +206,11 @@ class CHROMEOS_EXPORT OutputConfigurator
   virtual ~OutputConfigurator();
 
   ui::OutputState output_state() const { return output_state_; }
+  // This setter is only for testing.
+  void set_output_state(ui::OutputState new_state) {
+    output_state_ = new_state;
+  }
+
   DisplayPowerState power_state() const { return power_state_; }
   const std::vector<OutputSnapshot>& cached_outputs() const {
     return cached_outputs_;
@@ -372,21 +357,6 @@ class CHROMEOS_EXPORT OutputConfigurator
   // in |power_state|.
   ui::OutputState ChooseOutputState(DisplayPowerState power_state) const;
 
-  // Computes the relevant transformation for mirror mode.
-  // |output| is the output on which mirror mode is being applied.
-  // Returns the transformation or identity if computations fail.
-  CoordinateTransformation GetMirrorModeCTM(
-      const OutputConfigurator::OutputSnapshot& output);
-
-  // Computes the relevant transformation for extended mode.
-  // |output| is the output on which extended mode is being applied.
-  // |width| and |height| are the width and height of the combined framebuffer.
-  // Returns the transformation or identity if computations fail.
-  CoordinateTransformation GetExtendedModeCTM(
-      const OutputConfigurator::OutputSnapshot& output,
-      int framebuffer_width,
-      int frame_buffer_height);
-
   // Returns the ratio between mirrored mode area and native mode area:
   // (mirror_mode_width * mirrow_mode_height) / (native_width * native_height)
   float GetMirroredDisplayAreaRatio(