Move touch CTM from X into Chrome

chromeos/display/output_configurator.h

 // Copyright (c) 2012 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 CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 32 matching lines @@
     ModeInfo(int width, int height, bool interlaced, float refresh_rate);
 
     int width;
     int height;
     bool interlaced;
     float refresh_rate;
   };
 
   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();
     ~OutputSnapshot();
 
     RROutput output;
 
     // CRTC that should be used for this output. Not necessarily the CRTC
     // that XRandR reports is currently being used.
     RRCrtc crtc;
@@ skipping 22 matching lines @@
 
     // The type of output.
     ui::OutputType type;
 
     // Map from mode IDs to details about the corresponding modes.
     ModeInfoMap mode_infos;
 
     // 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;
 
     bool has_display_id;
 
     // This output's index in the array returned by XRandR. Stable even as
     // outputs are connected or disconnected.
     int index;
   };
 
@@ skipping 105 matching lines @@
    public:
     virtual ~TouchscreenDelegate() {}
 
     // Searches for touchscreens among input devices,
     // and tries to match them up to screens in |outputs|.
     // |outputs| is an array of detected screens.
     // If a touchscreen with same resolution as an output's native mode
     // 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.
   class TestApi {
    public:
     TestApi(OutputConfigurator* configurator, int xrandr_event_base)
         : configurator_(configurator),
           xrandr_event_base_(xrandr_event_base) {}
     ~TestApi() {}
 
@@ skipping 47 matching lines @@
   // Returns the mode within |output| that matches the given size with highest
   // refresh rate. Returns None if no matching output was found.
   static RRMode FindOutputModeMatchingSize(const OutputSnapshot& output,
                                            int width,
                                            int height);
 
   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_; }
 
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
   }
   void set_mirroring_controller(SoftwareMirroringController* controller) {
     mirroring_controller_ = controller;
   }
 
   // Replaces |native_display_delegate_| with |delegate| and sets
@@ skipping 136 matching lines @@
 
   // Switches to the state specified in |output_state| and |power_state|.
   // On success, updates |output_state_|, |power_state_|, and
   // |cached_outputs_| and returns true.
   bool EnterState(ui::OutputState output_state, DisplayPowerState power_state);
 
   // Returns the output state that should be used with |cached_outputs_| while
   // 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(
       const OutputConfigurator::OutputSnapshot& output);
 
   // Applies output protections according to requests.
   bool ApplyProtections(const DisplayProtections& requests);
 
   StateController* state_controller_;
   SoftwareMirroringController* mirroring_controller_;
@@ skipping 45 matching lines @@
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList;
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_