8238936: The crash in XRobotPeer when the custom GraphicsDevice is used

Backport-of: 9d0a487

Author: mrserb

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

@@ -27,7 +27,6 @@
 
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Robot;
 import java.awt.peer.RobotPeer;
 
 import sun.awt.CGraphicsDevice;
@@ -49,7 +48,7 @@ final class CRobot implements RobotPeer {
      * Uses the given GraphicsDevice as the coordinate system for subsequent
      * coordinate calls.
      */
-    public CRobot(Robot r, CGraphicsDevice d) {
+    CRobot(CGraphicsDevice d) {
         fDevice = d;
         initRobot();
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package sun.lwawt.macosx;
 
 import java.awt.AWTError;
+import java.awt.AWTException;
 import java.awt.CheckboxMenuItem;
 import java.awt.Color;
 import java.awt.Component;
@@ -49,7 +50,6 @@
 import java.awt.Point;
 import java.awt.PopupMenu;
 import java.awt.RenderingHints;
-import java.awt.Robot;
 import java.awt.SystemTray;
 import java.awt.Taskbar;
 import java.awt.Toolkit;
@@ -499,8 +499,11 @@ public void sync() {
     }
 
     @Override
-    public RobotPeer createRobot(Robot target, GraphicsDevice screen) {
-        return new CRobot(target, (CGraphicsDevice)screen);
+    public RobotPeer createRobot(GraphicsDevice screen) throws AWTException {
+        if (screen instanceof CGraphicsDevice) {
+            return new CRobot((CGraphicsDevice) screen);
+        }
+        return super.createRobot(screen);
     }
 
     private native boolean isCapsLockOn();

src/java.desktop/share/classes/java/awt/Robot.java

@@ -136,7 +136,7 @@ private void init(GraphicsDevice screen) throws AWTException {
         checkRobotAllowed();
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         if (toolkit instanceof ComponentFactory) {
-            peer = ((ComponentFactory)toolkit).createRobot(this, screen);
+            peer = ((ComponentFactory)toolkit).createRobot(screen);
         }
         initLegalButtonMask();
     }

src/java.desktop/share/classes/sun/awt/ComponentFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,60 @@
 
 package sun.awt;
 
-import java.awt.peer.TaskbarPeer;
-import java.awt.*;
+import java.awt.AWTException;
+import java.awt.Button;
+import java.awt.Canvas;
+import java.awt.Checkbox;
+import java.awt.CheckboxMenuItem;
+import java.awt.Choice;
+import java.awt.Component;
+import java.awt.Desktop;
+import java.awt.Dialog;
+import java.awt.FileDialog;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.HeadlessException;
+import java.awt.Label;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.Panel;
+import java.awt.PopupMenu;
+import java.awt.ScrollPane;
+import java.awt.Scrollbar;
+import java.awt.Taskbar;
+import java.awt.TextArea;
+import java.awt.TextField;
+import java.awt.Window;
 import java.awt.dnd.DragGestureEvent;
 import java.awt.dnd.InvalidDnDOperationException;
 import java.awt.dnd.peer.DragSourceContextPeer;
-import java.awt.peer.*;
+import java.awt.peer.ButtonPeer;
+import java.awt.peer.CanvasPeer;
+import java.awt.peer.CheckboxMenuItemPeer;
+import java.awt.peer.CheckboxPeer;
+import java.awt.peer.ChoicePeer;
+import java.awt.peer.DesktopPeer;
+import java.awt.peer.DialogPeer;
+import java.awt.peer.FileDialogPeer;
+import java.awt.peer.FontPeer;
+import java.awt.peer.FramePeer;
+import java.awt.peer.LabelPeer;
+import java.awt.peer.LightweightPeer;
+import java.awt.peer.ListPeer;
+import java.awt.peer.MenuBarPeer;
+import java.awt.peer.MenuItemPeer;
+import java.awt.peer.MenuPeer;
+import java.awt.peer.MouseInfoPeer;
+import java.awt.peer.PanelPeer;
+import java.awt.peer.PopupMenuPeer;
+import java.awt.peer.RobotPeer;
+import java.awt.peer.ScrollPanePeer;
+import java.awt.peer.ScrollbarPeer;
+import java.awt.peer.TaskbarPeer;
+import java.awt.peer.TextAreaPeer;
+import java.awt.peer.TextFieldPeer;
+import java.awt.peer.WindowPeer;
 
 import sun.awt.datatransfer.DataTransferer;
 
@@ -437,9 +485,17 @@ default FontPeer getFontPeer(String name, int style) {
         return null;
     }
 
-    default RobotPeer createRobot(Robot target, GraphicsDevice screen)
-            throws AWTException {
-        throw new HeadlessException();
+    /**
+     * Creates the peer for a Robot.
+     *
+     * @param  screen the GraphicsDevice indicating the coordinate system the
+     *         Robot will operate in
+     * @return the peer created
+     * @throws AWTException if the platform configuration does not allow
+     *         low-level input control
+     */
+    default RobotPeer createRobot(GraphicsDevice screen) throws AWTException {
+        throw new AWTException(String.format("Unsupported device: %s", screen));
     }
 
     default DataTransferer getDataTransferer() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package sun.awt.X11;
 
-import java.awt.GraphicsConfiguration;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.peer.RobotPeer;
@@ -35,11 +34,12 @@
 import sun.awt.SunToolkit;
 import sun.awt.UNIXToolkit;
 import sun.awt.X11GraphicsConfig;
+import sun.awt.X11GraphicsDevice;
 import sun.security.action.GetPropertyAction;
 
 final class XRobotPeer implements RobotPeer {
 
-    static final boolean tryGtk;
+    private static final boolean tryGtk;
     static {
         loadNativeLibraries();
         tryGtk = Boolean.parseBoolean(
@@ -48,16 +48,10 @@ final class XRobotPeer implements RobotPeer {
                             ));
     }
     private static volatile boolean useGtk;
-    private X11GraphicsConfig   xgc = null;
+    private final X11GraphicsConfig  xgc;
 
-    /*
-     * native implementation uses some static shared data (pipes, processes)
-     * so use a class lock to synchronize native method calls
-     */
-    static Object robotLock = new Object();
-
-    XRobotPeer(GraphicsConfiguration gc) {
-        this.xgc = (X11GraphicsConfig)gc;
+    XRobotPeer(X11GraphicsDevice gd) {
+        xgc = (X11GraphicsConfig) gd.getDefaultConfiguration();
         SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
         setup(tk.getNumberOfButtons(),
                 AWTAccessor.getInputEventAccessor().getButtonDownMasks());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@
 import java.awt.PopupMenu;
 import java.awt.PrintJob;
 import java.awt.Rectangle;
-import java.awt.Robot;
 import java.awt.ScrollPane;
 import java.awt.Scrollbar;
 import java.awt.SystemColor;
@@ -1069,11 +1068,13 @@ protected static void targetDisposedPeer(Object target, Object peer) {
     }
 
     @Override
-    public RobotPeer createRobot(Robot target, GraphicsDevice screen) {
-        return new XRobotPeer(screen.getDefaultConfiguration());
+    public RobotPeer createRobot(GraphicsDevice screen) throws AWTException {
+        if (screen instanceof X11GraphicsDevice) {
+            return new XRobotPeer((X11GraphicsDevice) screen);
+        }
+        return super.createRobot(screen);
     }
 
-
   /*
      * On X, support for dynamic layout on resizing is governed by the
      * window manager.  If the window manager supports it, it happens

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package sun.awt.windows;
 
-import java.awt.GraphicsDevice;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.peer.RobotPeer;
@@ -34,9 +33,6 @@
 
 final class WRobotPeer implements RobotPeer {
 
-    WRobotPeer(GraphicsDevice screen) {
-    }
-
     public native void mouseMoveImpl(int x, int y);
     @Override
     public void mouseMove(int x, int y) {