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 <array>
@@ skipping 16 matching lines @@
 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);
 
+  bool operator==(TouchCalibrationData other) const {
+    if (bounds != other.bounds)
+      return false;
+    bool checked[4] = {false};
+    size_t match = 0;
+    // The Calibration point pairs need not be in order.
+    for (size_t row = 0; row < point_pairs.size(); row++) {
+      for (size_t o_row=0; o_row < other.point_pairs.size(); o_row++) {

[oshima, 2016/12/02 22:33:41]

shouldn't this always be paint_pairs.size() == other.point_pairs.size() == 4?

can you always short the data by 1st x point so that you can just compare using
== ?

[malaykeshav, 2016/12/03 02:01:28]

Done

+        if (checked[o_row])
+          continue;
+        if (other.point_pairs[o_row].first == point_pairs[row].first &&
+            other.point_pairs[o_row].second == point_pairs[row].second) {
+          checked[o_row] = true;
+          match++;
+          break;
+        }
+      }
+    }
+    return match == point_pairs.size();
+  }
+
   // 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_