--- old/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java	2015-10-21 04:33:36.815703000 -0700
+++ new/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java	2015-10-21 04:33:36.516415300 -0700
@@ -294,6 +294,12 @@
 
     synchronized native void reshapeFrame(int x, int y, int width, int height);
 
+    native Dimension getNativeWindowSize();
+
+    public Dimension getScaledWindowSize() {
+        return getNativeWindowSize();
+    }
+
     public boolean requestWindowFocus(CausedFocusEvent.Cause cause) {
         if (!focusAllowedFor()) {
             return false;
@@ -490,8 +496,7 @@
         }
 
         // get current GD
-        Win32GraphicsDevice oldDev = (Win32GraphicsDevice)winGraphicsConfig
-                                     .getDevice();
+        Win32GraphicsDevice oldDev = winGraphicsConfig.getDevice();
 
         Win32GraphicsDevice newDev;
         GraphicsDevice devs[] = GraphicsEnvironment