Updates display manager and display preferences to handle touch calibration 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 <algorithm>
 #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 CalibrationPointPairQuad = std::array<CalibrationPointPair, 4>;
   TouchCalibrationData();
   TouchCalibrationData(const CalibrationPointPairQuad& point_pairs,
                        const gfx::Size& bounds);
   TouchCalibrationData(const TouchCalibrationData& calibration_data);
 
+  static bool CalibrationPointPairCompare(const CalibrationPointPair& pair_1,
+                                          const CalibrationPointPair& pair_2) {
+    if (pair_1.first.y() < pair_2.first.y())
+      return true;
+    return pair_1.first.x() < pair_2.first.x();
+  }
+
+  bool 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);
+

[oshima, 2016/12/05 20:43:21]

return quad_1 == quad_2;

[malaykeshav, 2016/12/05 21:53:58]

Done

[malaykeshav, 2016/12/05 21:53:58]

Done

+    for (size_t row = 0; row < quad_1.size(); row++) {
+      if (quad_1[row] != quad_2[row])
+        return false;
+    }
+    return true;
+  }

[oshima, 2016/12/05 20:43:21]

please move to .cc.

[malaykeshav, 2016/12/05 21:53:58]

done

+
   // Calibration point pairs used during calibration. Each point pair contains a
   // display point and the corresponding touch point.
   CalibrationPointPairQuad 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
@@ skipping 344 matching lines @@
   // 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_