Get Win32K lockdown for renderers working again on Windows 8+.

ui/gfx/win/dpi.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/win/dpi.h"
 
 #include <windows.h>
 #include "base/command_line.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/windows_version.h"
@@ skipping 116 matching lines @@
     // user must logout to change the DPI setting. This value also applies
     // to all screens.
     dpi_x = GetDeviceCaps(screen_dc, LOGPIXELSX);
     dpi_y = GetDeviceCaps(screen_dc, LOGPIXELSY);
   }
   return Size(dpi_x, dpi_y);
 }
 
 float GetDPIScale() {
   if (IsHighDPIEnabled()) {
-    if (GetDPI().width() <= 120) {
-      // 120 logical pixels is 125% scale. We do this to maintain previous
+    float dpi_scale = gfx::Display::HasForceDeviceScaleFactor() ?

[sky, 2014/09/24 23:51:15]

If there is a forced scale we should honor it.

[ananta, 2014/09/24 23:56:00]

Thanks for catching that. Fixed

+        gfx::Display::GetForcedDeviceScaleFactor() :
+        GetUnforcedDeviceScaleFactor();
+    if (dpi_scale <= 1.25) {
+      // Force 125% and below to 100% scale. We do this to maintain previous
       // (non-DPI-aware) behavior where only the font size was boosted.
       return 1.0;
     }
-    return gfx::Display::HasForceDeviceScaleFactor() ?
-        gfx::Display::GetForcedDeviceScaleFactor() :
-        GetUnforcedDeviceScaleFactor();
+    return dpi_scale;
   }
   return 1.0;
 }
 
 void ForceHighDPISupportForTesting(float scale) {
   g_device_scale_factor = scale;
 }
 
 bool IsHighDPIEnabled() {
   // Flag stored in HKEY_CURRENT_USER\SOFTWARE\\Google\\Chrome\\Profile,
@@ skipping 69 matching lines @@
   return static_cast<int>(GetSystemMetrics(metric) /
       GetDeviceScaleFactor() + 0.5);
 }
 
 bool IsDeviceScaleFactorSet() {
   return g_device_scale_factor != 0.0f;
 }
 
 }  // namespace win
 }  // namespace gfx