Prepare ManagedDisplayInfo to store touch calibration associated data

ui/display/manager/managed_display_info.cc

 // 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.
 
 #include "ui/display/manager/managed_display_info.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 57 matching lines @@
     if (size_a_dip.GetArea() == size_b_dip.GetArea())
       return (a->refresh_rate() > b->refresh_rate());
     return (size_a_dip.GetArea() < size_b_dip.GetArea());
   }
 
   bool is_internal;
 };
 
 }  // namespace
 
+TouchCalibrationData::TouchCalibrationData() {}
+
+TouchCalibrationData::TouchCalibrationData(
+    const TouchCalibrationData::CalibrationPointPairQuad& point_pairs,
+    const gfx::Size& bounds) : point_pairs(point_pairs),
+                               bounds(bounds) {}
+
+TouchCalibrationData::TouchCalibrationData(
+    const TouchCalibrationData& calibration_data)
+    : point_pairs(calibration_data.point_pairs),
+      bounds(calibration_data.bounds) {}
+
 ManagedDisplayMode::ManagedDisplayMode()
     : refresh_rate_(0.0f),
       is_interlaced_(false),
       native_(false),
       ui_scale_(1.0f),
       device_scale_factor_(1.0f) {}
 
 ManagedDisplayMode::ManagedDisplayMode(const gfx::Size& size)
     : size_(size),
       refresh_rate_(0.0f),
@@ skipping 184 matching lines @@
 // static
 void ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(bool enable) {
   use_125_dsf_for_ui_scaling = enable;
 }
 
 ManagedDisplayInfo::ManagedDisplayInfo()
     : id_(kInvalidDisplayId),
       has_overscan_(false),
       active_rotation_source_(Display::ROTATION_SOURCE_UNKNOWN),
       touch_support_(Display::TOUCH_SUPPORT_UNKNOWN),
+      has_touch_calibration_data_(false),
       device_scale_factor_(1.0f),
       device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
       clear_overscan_insets_(false),
       color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
 ManagedDisplayInfo::ManagedDisplayInfo(int64_t id,
                                        const std::string& name,
                                        bool has_overscan)
     : id_(id),
       name_(name),
       has_overscan_(has_overscan),
       active_rotation_source_(Display::ROTATION_SOURCE_UNKNOWN),
       touch_support_(Display::TOUCH_SUPPORT_UNKNOWN),
+      has_touch_calibration_data_(false),
       device_scale_factor_(1.0f),
       device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
       clear_overscan_insets_(false),
       color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
 ManagedDisplayInfo::ManagedDisplayInfo(const ManagedDisplayInfo& other) =
@@ skipping 41 matching lines @@
   // or unit tests. Don't copy if this native_info came from
   // DisplayChangeObserver.
   if (!native_info.native()) {
     // Update the overscan_insets_in_dip_ either if the inset should be
     // cleared, or has non empty insts.
     if (native_info.clear_overscan_insets())
       overscan_insets_in_dip_.Set(0, 0, 0, 0);
     else if (!native_info.overscan_insets_in_dip_.IsEmpty())
       overscan_insets_in_dip_ = native_info.overscan_insets_in_dip_;
 
+    has_touch_calibration_data_ = native_info.has_touch_calibration_data_;
+    if (has_touch_calibration_data_)
+      touch_calibration_data_ = native_info.touch_calibration_data_;
+
     rotations_ = native_info.rotations_;
     configured_ui_scale_ = native_info.configured_ui_scale_;
     color_profile_ = native_info.color_profile();
   }
 }
 
 void ManagedDisplayInfo::SetBounds(const gfx::Rect& new_bounds_in_native) {
   bounds_in_native_ = new_bounds_in_native;
   size_in_pixel_ = new_bounds_in_native.size();
   UpdateDisplaySize();
@@ skipping 120 matching lines @@
 }
 
 void ManagedDisplayInfo::ClearInputDevices() {
   input_devices_.clear();
 }
 
 void ResetDisplayIdForTest() {
   synthesized_display_id = kSynthesizedDisplayIdStart;
 }
 
+void ManagedDisplayInfo::SetTouchCalibrationData(
+    const TouchCalibrationData& touch_calibration_data) {
+  has_touch_calibration_data_ = true;
+  touch_calibration_data_ = touch_calibration_data;
+}
+
 }  // namespace display