Fix high-DPI on Windows to make use of DIP scaling in WebKit.

ui/gfx/screen_win.cc

 // 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.
 
 #include "ui/gfx/screen_win.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "ui/gfx/display.h"
@@ skipping 18 matching lines @@
 
 namespace gfx {
 
 ScreenWin::ScreenWin() {
 }
 
 ScreenWin::~ScreenWin() {
 }
 
 bool ScreenWin::IsDIPEnabled() {
+#if defined(ENABLE_HIDPI)
+  return true;
+#else
   return false;
+#endif
 }
 
 gfx::Point ScreenWin::GetCursorScreenPoint() {
   POINT pt;
   GetCursorPos(&pt);
   return gfx::Point(pt);
 }
 
 gfx::NativeWindow ScreenWin::GetWindowAtCursorScreenPoint() {
   POINT location;
@@ skipping 35 matching lines @@
   RECT other_bounds_rect = match_rect.ToRECT();
   MONITORINFO monitor_info = GetMonitorInfoForMonitor(MonitorFromRect(
       &other_bounds_rect, MONITOR_DEFAULTTONEAREST));
   return GetDisplay(monitor_info);
 }
 
 gfx::Display ScreenWin::GetPrimaryDisplay() const {
   MONITORINFO mi = GetMonitorInfoForMonitor(
       MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY));
   gfx::Display display = GetDisplay(mi);
+#if !defined(ENABLE_HIDPI)
+  // TODO(kevers|girard): Test if these checks can be reintroduced for high-DIP
+  // once more of the app is DIP-aware.
   DCHECK_EQ(GetSystemMetrics(SM_CXSCREEN), display.size().width());
   DCHECK_EQ(GetSystemMetrics(SM_CYSCREEN), display.size().height());
+#endif
   return display;
 }
 
 void ScreenWin::AddObserver(DisplayObserver* observer) {
   // TODO(oshima): crbug.com/122863.
 }
 
 void ScreenWin::RemoveObserver(DisplayObserver* observer) {
   // TODO(oshima): crbug.com/122863.
 }
@@ skipping 16 matching lines @@
 #endif  // USE_AURA
 }
 
 #if !defined(USE_AURA)
 Screen* CreateNativeScreen() {
   return new ScreenWin;
 }
 #endif  // !USE_AURA
 
 }  // namespace gfx