Prepare ManagedDisplayInfo to store touch calibration associated data

ui/display/manager/managed_display_info.h

 // Copyright (c) 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_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_
 #define UI_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_
 
 #include <stdint.h>
 
+#include <array>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "ui/display/display.h"
 #include "ui/display/display_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace display {
 
+// A struct that represents all the data required for touch calibration for the
+// display.
+struct DISPLAY_EXPORT TouchCalibrationData {
+  // CalibrationPointPair.first -> display point
+  // CalibrationPointPair.second -> touch point
+  using CalibrationPointPair = std::pair<gfx::Point, gfx::Point>;
+  using CalibrationPoints = std::array<CalibrationPointPair, 4>;

[oshima, 2016/11/23 21:52:42]

how about CalibrationPointPairQuad ?

[malaykeshav, 2016/11/23 22:11:27]

Done

+  TouchCalibrationData();
+  TouchCalibrationData(const CalibrationPoints& point_pairs,
+                       const gfx::Size& bounds);
+  TouchCalibrationData(const TouchCalibrationData& calibration_data);
+
+  // Calibration point pairs used during calibration. Each point pair contains a
+  // display point and the corresponding touch point.
+  CalibrationPoints point_pairs;
+
+  // Bounds of the touch display when the calibration was performed.
+  gfx::Size bounds;
+};
+
 // A class that represents the display's mode info.
 class DISPLAY_EXPORT ManagedDisplayMode
     : public base::RefCounted<ManagedDisplayMode> {
  public:
   ManagedDisplayMode();
 
   explicit ManagedDisplayMode(const gfx::Size& size);
 
   ManagedDisplayMode(const gfx::Size& size,
                      float refresh_rate,
@@ skipping 202 matching lines @@
   void set_clear_overscan_insets(bool clear) { clear_overscan_insets_ = clear; }
 
   void set_native(bool native) { native_ = native; }
   bool native() const { return native_; }
 
   const ManagedDisplayModeList& display_modes() const { return display_modes_; }
   // Sets the display mode list. The mode list will be sorted for the
   // display.
   void SetManagedDisplayModes(const ManagedDisplayModeList& display_modes);
 
+
+   // Sets/Gets the touch calibration data for the display.

[oshima, 2016/11/23 21:52:42]

indent

[malaykeshav, 2016/11/23 22:11:27]

Done

+  void SetTouchCalibrationData(const TouchCalibrationData& calibration_data);
+  TouchCalibrationData

[oshima, 2016/11/23 21:52:42]

const &

[malaykeshav, 2016/11/23 22:11:27]

Done

+      GetTouchCalibrationData() const { return touch_calibration_data_; }
+  bool has_touch_calibration_data() const
+      { return has_touch_calibration_data_; }
+  void clear_touch_calibration_data() { has_touch_calibration_data_ = false; }
+
   // Returns the native mode size. If a native mode is not present, return an
   // empty size.
   gfx::Size GetNativeModeSize() const;
 
   ui::ColorCalibrationProfile color_profile() const { return color_profile_; }
 
   // Sets the color profile. It will ignore if the specified |profile| is not in
   // |available_color_profiles_|.
   void SetColorProfile(ui::ColorCalibrationProfile profile);
 
@@ skipping 39 matching lines @@
   // SetUse125DSFForUIScaling(true) is called and this is the internal display.
   bool Use125DSFForUIScaling() const;
 
   int64_t id_;
   std::string name_;
   base::FilePath sys_path_;
   bool has_overscan_;
   std::map<Display::RotationSource, Display::Rotation> rotations_;
   Display::RotationSource active_rotation_source_;
   Display::TouchSupport touch_support_;
+  bool has_touch_calibration_data_;
 
   // The set of input devices associated with this display.
   std::vector<int> input_devices_;
 
   // This specifies the device's pixel density. (For example, a
   // display whose DPI is higher than the threshold is considered to have
   // device_scale_factor = 2.0 on Chrome OS).  This is used by the
   // grapics layer to choose and draw appropriate images and scale
   // layers properly.
   float device_scale_factor_;
@@ skipping 32 matching lines @@
 
   // The current profile of the color calibration.
   ui::ColorCalibrationProfile color_profile_;
 
   // The list of available variations for the color calibration.
   std::vector<ui::ColorCalibrationProfile> available_color_profiles_;
 
   // Maximum cursor size.
   gfx::Size maximum_cursor_size_;
 
+  // Information associated to touch calibration for the display.
+  TouchCalibrationData touch_calibration_data_;
+
   // If you add a new member, you need to update Copy().
 };
 
 // Resets the synthesized display id for testing. This
 // is necessary to avoid overflowing the output index.
 void DISPLAY_EXPORT ResetDisplayIdForTest();
 
 }  // namespace display
 
 #endif  //  UI_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_