ScreenWin Testability and Restructuring

ui/gfx/display.h

 // Copyright (c) 2012 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_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
@@ skipping 136 matching lines @@
 
  private:
   int64_t id_;
   Rect bounds_;
   Rect work_area_;
   float device_scale_factor_;
   Rotation rotation_;
   TouchSupport touch_support_;
 };
 
+inline bool operator==(const gfx::Display& lhs, const gfx::Display& rhs) {
+  return lhs.id() == rhs.id() &&
+         lhs.bounds() == rhs.bounds() &&
+         lhs.work_area() == rhs.work_area() &&
+         lhs.device_scale_factor() == rhs.device_scale_factor() &&
+         lhs.rotation() == rhs.rotation() &&
+         lhs.touch_support() == rhs.touch_support();
+}

[oshima, 2016/01/28 18:32:04]

One concern I have is that this differ from identifying / looking up display
which uses id, and this may be misused in the non test code in the future.

how about moving to ui/gfx/test/display_util.h ?

[robliao, 2016/01/29 01:44:40]

sgtm. Done.

+
+// This is declared here for use in gtest-based unit tests but is defined in
+// the gfx_test_support target. Depend on that to use this in your unit test.
+// This should not be used in production code - call ToString() instead.
+void PrintTo(const Display& display, ::std::ostream* os);
+
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_