--- old/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java	2015-11-05 00:38:28.482248300 -0800
+++ new/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java	2015-11-05 00:38:28.232215200 -0800
@@ -51,6 +51,9 @@
 
 public final class Win32GraphicsEnvironment extends SunGraphicsEnvironment {
 
+    static final float debugScaleX;
+    static final float debugScaleY;
+
     static {
         // Ensure awt is loaded already.  Also, this forces static init
         // of WToolkit and Toolkit, which we depend upon
@@ -61,6 +64,21 @@
 
         // Install correct surface manager factory.
         SurfaceManagerFactory.setInstance(new WindowsSurfaceManagerFactory());
+
+        double sx = -1;
+        double sy = -1;
+        if (isUIScaleEnabled()) {
+            sx = getScaleFactor("sun.java2d.win.uiScaleX");
+            sy = getScaleFactor("sun.java2d.win.uiScaleY");
+            if (sx <= 0 || sy <= 0) {
+                double s = getDebugScale();
+                sx = s;
+                sy = s;
+            }
+        }
+
+        debugScaleX = (float) sx;
+        debugScaleY = (float) sy;
     }
 
     /**