8006421: GraphicsConfiguration of a frame is changed when the frame is moved to another screen

src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java

@@ -201,8 +201,7 @@ public void repositionSecurityWarning() {
 
     @Override
     public GraphicsConfiguration getAppropriateGraphicsConfiguration(
-            GraphicsConfiguration gc)
-    {
+            GraphicsConfiguration gc) {
         return gc;
     }
 

src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java

@@ -207,39 +207,6 @@ void preInit(XCreateWindowParams params) {
         ((X11GraphicsDevice)gc.getDevice()).addDisplayChangedListener(this);
     }
 
-    public GraphicsConfiguration getAppropriateGraphicsConfiguration(
-            GraphicsConfiguration gc)
-    {
-        if (graphicsConfig == null || gc == null) {
-            return gc;
-        }
-
-        final X11GraphicsDevice newDev = getSameScreenDevice(gc);
-        final int visualToLookFor = graphicsConfig.getVisual();
-
-        final GraphicsConfiguration[] configurations = newDev.getConfigurations();
-        for (final GraphicsConfiguration config : configurations) {
-            final X11GraphicsConfig x11gc = (X11GraphicsConfig) config;
-            if (visualToLookFor == x11gc.getVisual()) {
-                graphicsConfig = x11gc;
-            }
-        }
-        return graphicsConfig;
-    }
-
-    private X11GraphicsDevice getSameScreenDevice(GraphicsConfiguration gc) {
-        XToolkit.awtLock();
-        try {
-            final int screenNum = ((X11GraphicsDevice) gc.getDevice()).getScreen();
-            return (X11GraphicsDevice) GraphicsEnvironment.
-                    getLocalGraphicsEnvironment().
-                    getScreenDevices()[screenNum];
-        } finally {
-            XToolkit.awtUnlock();
-        }
-    }
-
-
     protected String getWMName() {
         String name = target.getName();
         if (name == null || name.trim().isEmpty()) {

src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java

@@ -662,13 +662,6 @@ boolean isTargetUndecorated() {
      @Override
      public native void repositionSecurityWarning();
 
-    @Override
-    public GraphicsConfiguration getAppropriateGraphicsConfiguration(
-            GraphicsConfiguration gc)
-    {
-        return gc;
-    }
-
     @Override
     public void print(Graphics g) {
         // We assume we print the whole frame,