8019591: JCK: testICSEthrowing_fullScreen fails: no ICSE thrown
Reviewed-by: art, anthony
--- a/jdk/src/share/classes/java/awt/GraphicsDevice.java Mon Oct 14 18:52:25 2013 +0400
+++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java Mon Oct 14 20:11:56 2013 +0400
@@ -325,7 +325,14 @@
// Note that we use the graphics configuration of the device,
// not the window's, because we're setting the fs window for
// this device.
- Rectangle screenBounds = getDefaultConfiguration().getBounds();
+ final GraphicsConfiguration gc = getDefaultConfiguration();
+ final Rectangle screenBounds = gc.getBounds();
+ if (SunToolkit.isDispatchThreadForAppContext(fullScreenWindow)) {
+ // Update graphics configuration here directly and do not wait
+ // asynchronous notification from the peer. Note that
+ // setBounds() will reset a GC, if it was set incorrectly.
+ fullScreenWindow.setGraphicsConfiguration(gc);
+ }
fullScreenWindow.setBounds(screenBounds.x, screenBounds.y,
screenBounds.width, screenBounds.height);
fullScreenWindow.setVisible(true);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java Mon Oct 14 20:11:56 2013 +0400
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 8019591
+ * @author Sergey Bylokhov
+ */
+public class WindowGCInFullScreen {
+
+ public static void main(final String[] args)
+ throws InvocationTargetException, InterruptedException {
+ SwingUtilities.invokeAndWait(() -> {
+ final GraphicsDevice[] devices =
+ GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .getScreenDevices();
+ final Frame frame = new Frame();
+ frame.setBackground(Color.GREEN);
+ frame.setUndecorated(true);
+ frame.setSize(100, 100);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ sleep();
+ for (final GraphicsDevice gd : devices) {
+ try {
+ gd.setFullScreenWindow(frame);
+ if (gd.getFullScreenWindow() != frame) {
+ throw new RuntimeException("Wrong window");
+ }
+ if (frame.getGraphicsConfiguration().getDevice() != gd) {
+ throw new RuntimeException("Wrong new GraphicsDevice");
+ }
+ } finally {
+ // cleaning up
+ gd.setFullScreenWindow(null);
+ }
+ }
+ frame.dispose();
+ });
+ }
+
+ private static void sleep() {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignored) {
+ }
+ }
+}