Updates display manager and display preferences to handle touch calibration 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 69 matching lines @@
 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) {}
 
+bool TouchCalibrationData::operator==(TouchCalibrationData other) const {
+  if (bounds != other.bounds)
+    return false;
+  CalibrationPointPairQuad quad_1 = point_pairs;
+  CalibrationPointPairQuad& quad_2 = other.point_pairs;
+
+  // Make sure the point pairs are in the correct order.
+  std::sort(quad_1.begin(), quad_1.end(), CalibrationPointPairCompare);
+  std::sort(quad_2.begin(), quad_2.end(), CalibrationPointPairCompare);
+
+  return quad_1 == quad_2;
+}
+
 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 415 matching lines @@
   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