ScreenWin Testability and Restructuring

ui/gfx/win/display_info.cc

Index: ui/gfx/win/display_info.cc
diff --git a/ui/gfx/win/display_info.cc b/ui/gfx/win/display_info.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6f351e11c6ae08aaee7b682321ec3b973284903b
--- /dev/null
+++ b/ui/gfx/win/display_info.cc
@@ -0,0 +1,80 @@
+// Copyright 2016 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/gfx/win/display_info.h"
+
+#include "base/hash.h"
+#include "base/strings/utf_string_conversions.h"
+
+namespace {
+
+gfx::Display::Rotation GetRotationForDevice(const wchar_t* device_name) {
+  DEVMODE mode;
+  ::ZeroMemory(&mode, sizeof(mode));
+  mode.dmSize = sizeof(mode);
+  mode.dmDriverExtra = 0;
+  if (::EnumDisplaySettings(device_name, ENUM_CURRENT_SETTINGS, &mode)) {
+    switch (mode.dmDisplayOrientation) {
+    case DMDO_DEFAULT:
+      return gfx::Display::ROTATE_0;
+    case DMDO_90:
+      return gfx::Display::ROTATE_90;
+    case DMDO_180:
+      return gfx::Display::ROTATE_180;
+    case DMDO_270:
+      return gfx::Display::ROTATE_270;
+    default:
+      NOTREACHED();
+    }
+  }
+  return gfx::Display::ROTATE_0;
+}
+
+}  // namespace
+
+namespace gfx {
+namespace win {
+
+// static
+int64_t DisplayInfo::HashDeviceName(const wchar_t* device_name) {
+  return static_cast<int64_t>(base::Hash(base::WideToUTF8(device_name)));
+}
+
+DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info,
+                         float device_scale_factor)
+    : DisplayInfo(monitor_info,
+                  device_scale_factor,
+                  GetRotationForDevice(monitor_info.szDevice)) {}
+
+DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info,
+                         float device_scale_factor,
+                         gfx::Display::Rotation rotation)
+    : id_(HashDeviceName(monitor_info.szDevice)),
+      screen_rect_(monitor_info.rcMonitor),
+      screen_work_rect_(monitor_info.rcWork),
+      rotation_(rotation),
+      device_scale_factor_(device_scale_factor) {}
+
+int64_t DisplayInfo::id() const {
+  return id_;
+}
+
+gfx::Display::Rotation DisplayInfo::rotation() const {
+  return rotation_;
+}
+
+const gfx::Rect& DisplayInfo::screen_rect() const {
+  return screen_rect_;
+}
+
+const gfx::Rect& DisplayInfo::screen_work_rect() const {
+  return screen_work_rect_;
+}
+
+float DisplayInfo::device_scale_factor() const {
+  return device_scale_factor_;
+}

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

any reason not to inline these?

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

See
https://www.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-Stop-i...

"Be careful about your accessors"

+
+}  // namespace win
+}  // namespace gfx