Re-land "Issue 191223007: Move touch CTM from X into Chrome"

ui/display/chromeos/display_configurator.h

 // Copyright 2014 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_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/display/display_export.h"
 #include "ui/display/types/chromeos/native_display_observer.h"
 #include "ui/display/types/display_constants.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class Point;
 class Size;
 }
 
 namespace ui {
 class DisplayMode;
 class DisplaySnapshot;
 class NativeDisplayDelegate;
 
 // This class interacts directly with the system display configurator.
 class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
  public:
   typedef uint64_t ContentProtectionClientId;
   static const ContentProtectionClientId kInvalidClientId = 0;
 
-  struct CoordinateTransformation {
-    // Initialized to the identity transformation.
-    CoordinateTransformation();
-
-    float x_scale;
-    float x_offset;
-    float y_scale;
-    float y_offset;
-  };
-
   struct DisplayState {
     DisplayState();
 
     DisplaySnapshot* display;  // Not owned.
 
     // XInput device ID or 0 if this display isn't a touchscreen.
     int touch_device_id;
 
-    CoordinateTransformation transform;
-
     // User-selected mode for the display.
     const DisplayMode* selected_mode;
 
     // Mode used when displaying the same desktop on multiple displays.
     const DisplayMode* mirror_mode;
   };
 
   typedef std::vector<DisplayState> DisplayStateList;
 
   class Observer {
@@ skipping 41 matching lines @@
   class TouchscreenDelegate {
    public:
     virtual ~TouchscreenDelegate() {}
 
     // Searches for touchscreens among input devices,
     // and tries to match them up to screens in |displays|.
     // |displays| is an array of detected screens.
     // If a touchscreen with same resolution as a display's native mode
     // is detected, its id will be stored in this display.
     virtual void AssociateTouchscreens(std::vector<DisplayState>* displays) = 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(DisplayConfigurator* configurator) : configurator_(configurator) {}
     ~TestApi() {}
 
     // If |configure_timer_| is started, stops the timer, runs
     // ConfigureDisplays(), and returns true; returns false otherwise.
@@ skipping 26 matching lines @@
   // refresh rate. Returns None if no matching display was found.
   static const DisplayMode* FindDisplayModeMatchingSize(
       const DisplaySnapshot& display,
       const gfx::Size& size);
 
   DisplayConfigurator();
   virtual ~DisplayConfigurator();
 
   MultipleDisplayState display_state() const { return display_state_; }
   chromeos::DisplayPowerState power_state() const { return power_state_; }
+  const gfx::Size framebuffer_size() const { return framebuffer_size_; }
   const std::vector<DisplayState>& cached_displays() const {
     return cached_displays_;
   }
 
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
   }
   void set_mirroring_controller(SoftwareMirroringController* controller) {
     mirroring_controller_ = controller;
   }
@@ skipping 144 matching lines @@
   // On success, updates |display_state_|, |power_state_|, and
   // |cached_displays_| and returns true.
   bool EnterState(MultipleDisplayState display_state,
                   chromeos::DisplayPowerState power_state);
 
   // Returns the display state that should be used with |cached_displays_| while
   // in |power_state|.
   MultipleDisplayState ChooseDisplayState(
       chromeos::DisplayPowerState power_state) const;
 
-  // Computes the relevant transformation for mirror mode.
-  // |display| is the display on which mirror mode is being applied.
-  // Returns the transformation or identity if computations fail.
-  CoordinateTransformation GetMirrorModeCTM(const DisplayState& display);
-
-  // Computes the relevant transformation for extended mode. |display| is the
-  // display on which extended mode is being applied. |new_origin| is the
-  // position of the display on the framebuffer. |framebuffer_size| is the
-  // size of the combined framebuffer.
-  // Returns the transformation or identity if computations fail.
-  CoordinateTransformation GetExtendedModeCTM(
-      const DisplayState& display,
-      const gfx::Point& new_origin,
-      const gfx::Size& framebuffer_size);
-
   // Returns the ratio between mirrored mode area and native mode area:
   // (mirror_mode_width * mirrow_mode_height) / (native_width * native_height)
   float GetMirroredDisplayAreaRatio(const DisplayState& display);
 
   // Applies display protections according to requests.
   bool ApplyProtections(const ContentProtections& requests);
 
   StateController* state_controller_;
   SoftwareMirroringController* mirroring_controller_;
   scoped_ptr<NativeDisplayDelegate> native_display_delegate_;
@@ skipping 13 matching lines @@
   // This is detected by the constructor to determine whether or not we should
   // be enabled.  If we aren't running on ChromeOS, we can't assume that the
   // Xrandr X11 extension is supported.
   // If this flag is set to false, any attempts to change the display
   // configuration to immediately fail without changing the state.
   bool configure_display_;
 
   // The current display state.
   MultipleDisplayState display_state_;
 
+  gfx::Size framebuffer_size_;
+
   // The current power state.
   chromeos::DisplayPowerState power_state_;
 
   // Most-recently-used display configuration. Note that the actual
   // configuration changes asynchronously.
   DisplayStateList cached_displays_;
 
   ObserverList<Observer> observers_;
 
   // The timer to delay configuring displays. See also the comments in
   // Dispatch().
   scoped_ptr<base::OneShotTimer<DisplayConfigurator> > configure_timer_;
 
   // Id for next display protection client.
   ContentProtectionClientId next_display_protection_client_id_;
 
   // Display protection requests of each client.
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_