Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: ui/gfx/win/display_info.cc

Issue 1426933002: Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Other Unit Tests - Moved Inner Classes Outside Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..9876dc996bb6362413104abac4364b56a99688e2
--- /dev/null
+++ b/ui/gfx/win/display_info.cc
@@ -0,0 +1,88 @@
+// 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(DEVMODE);
+ 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 {
+
+int64_t DisplayInfo::HashDeviceName(const wchar_t* device_name) {
+ return static_cast<int64_t>(base::Hash(base::WideToUTF8(device_name)));
+}
+
+DisplayInfo::DisplayInfo(HMONITOR monitor, float device_scale_factor)
+ : device_scale_factor_(device_scale_factor){
+ MONITORINFOEX monitor_info;
+ ::ZeroMemory(&monitor_info, sizeof(monitor_info));
+ monitor_info.cbSize = sizeof(monitor_info);
+ ::GetMonitorInfo(monitor, &monitor_info);
+ InitializeFromMonitorInfo(monitor_info);
+}
+
+DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info,
+ gfx::Display::Rotation rotation,
+ float device_scale_factor)
+ : rotation_(rotation),
+ device_scale_factor_(device_scale_factor) {
+ InitializeFromMonitorInfo(monitor_info);
+}
+
+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_;
+}
+
+void DisplayInfo::InitializeFromMonitorInfo(const MONITORINFOEX& monitor_info) {
+ id_ = HashDeviceName(monitor_info.szDevice);
+ screen_rect_ = gfx::Rect(monitor_info.rcMonitor);
+ screen_work_rect_ = gfx::Rect(monitor_info.rcWork);
+ rotation_ = GetRotationForDevice(monitor_info.szDevice);
+}
+
+} // namespace win
+} // namespace gfx

Powered by Google App Engine
This is Rietveld 408576698