Mercurial > hg > openjdk > jdk8u > jdk
changeset 13446:74f7c62048f5
8207070: Webstart app popup on wrong screen in a one-screen setup changing to multi-monitor
Summary: Run updates in a thread pool rather than on the display thread
Reviewed-by: prr
author | phh |
---|---|
date | Mon, 25 Feb 2019 09:40:04 +0000 |
parents | 5833bcef26ca |
children | 3a37ebd8c506 |
files | src/windows/classes/sun/awt/windows/WToolkit.java src/windows/classes/sun/awt/windows/WWindowPeer.java test/java/awt/Toolkit/DisplayChangesException/DisplayChangesException.java |
diffstat | 3 files changed, 158 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WToolkit.java Mon Feb 25 07:03:19 2019 +0000 +++ b/src/windows/classes/sun/awt/windows/WToolkit.java Mon Feb 25 09:40:04 2019 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2019, 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 @@ -68,6 +68,8 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import sun.font.FontManager; import sun.font.FontManagerFactory; @@ -828,20 +830,34 @@ .paletteChanged(); } + private static ExecutorService displayChangeExecutor; + /* * Called from Toolkit native code when a WM_DISPLAYCHANGE occurs. * Have Win32GraphicsEnvironment execute the display change code on the * Event thread. */ static public void displayChanged() { - EventQueue.invokeLater(new Runnable() { - @Override - public void run() { - ((Win32GraphicsEnvironment)GraphicsEnvironment - .getLocalGraphicsEnvironment()) - .displayChanged(); + final Runnable runnable = () -> { + Object lge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + if (lge instanceof DisplayChangedListener) { + ((DisplayChangedListener) lge).displayChanged(); } - }); + }; + if (AppContext.getAppContext() != null) { + // Common case, standalone application + EventQueue.invokeLater(runnable); + } else { + if (displayChangeExecutor == null) { + // No synchronization, called on the Toolkit thread only + displayChangeExecutor = Executors.newFixedThreadPool(1, r -> { + Thread t = Executors.defaultThreadFactory().newThread(r); + t.setDaemon(true); + return t; + }); + } + displayChangeExecutor.submit(runnable); + } } /**
--- a/src/windows/classes/sun/awt/windows/WWindowPeer.java Mon Feb 25 07:03:19 2019 +0000 +++ b/src/windows/classes/sun/awt/windows/WWindowPeer.java Mon Feb 25 09:40:04 2019 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2019, 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 @@ -474,13 +474,7 @@ * Called from native code when we have been dragged onto another screen. */ void draggedToNewScreen() { - SunToolkit.executeOnEventHandlerThread((Component)target,new Runnable() - { - @Override - public void run() { - displayChanged(); - } - }); + displayChanged(); } public void updateGC() { @@ -539,7 +533,7 @@ */ @Override public void displayChanged() { - updateGC(); + SunToolkit.executeOnEventHandlerThread(target, this::updateGC); } /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/Toolkit/DisplayChangesException/DisplayChangesException.java Mon Feb 25 09:40:04 2019 +0000 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2018, 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.EventQueue; +import java.awt.GraphicsEnvironment; +import java.awt.Toolkit; +import java.lang.reflect.Method; +import java.util.concurrent.CountDownLatch; + +import javax.swing.JButton; +import javax.swing.JFrame; + +import sun.awt.DisplayChangedListener; +import sun.awt.SunToolkit; + +/** + * @test + * @key headful + * @bug 8207070 + * @modules java.desktop/sun.java2d + * java.desktop/sun.awt + */ +public final class DisplayChangesException { + + private static boolean fail; + private static CountDownLatch go = new CountDownLatch(1); + + static final class TestThread extends Thread { + + private JFrame frame; + + private TestThread(ThreadGroup tg, String threadName) { + super(tg, threadName); + } + + public void run() { + try { + test(); + } catch (final Exception e) { + throw new RuntimeException(e); + } + } + + private void test() throws Exception { + SunToolkit.createNewAppContext(); + EventQueue.invokeAndWait(() -> { + frame = new JFrame(); + final JButton b = new JButton(); + b.addPropertyChangeListener(evt -> { + if (!SunToolkit.isDispatchThreadForAppContext(b)) { + System.err.println("Wrong thread:" + currentThread()); + fail = true; + } + }); + frame.add(b); + frame.setSize(100, 100); + frame.setLocationRelativeTo(null); + frame.pack(); + }); + go.await(); + EventQueue.invokeAndWait(() -> { + frame.dispose(); + }); + } + } + + public static void main(final String[] args) throws Exception { + ThreadGroup tg0 = new ThreadGroup("ThreadGroup0"); + ThreadGroup tg1 = new ThreadGroup("ThreadGroup1"); + + TestThread t0 = new TestThread(tg0, "TestThread 0"); + TestThread t1 = new TestThread(tg1, "TestThread 1"); + + t0.start(); + t1.start(); + Thread.sleep(1500); // Cannot use Robot.waitForIdle + testToolkit(); + Thread.sleep(1500); + testGE(); + Thread.sleep(1500); + go.countDown(); + + if (fail) { + throw new RuntimeException(); + } + } + + private static void testGE() { + Object ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + if (!(ge instanceof DisplayChangedListener)) { + return; + } + ((DisplayChangedListener) ge).displayChanged(); + } + + private static void testToolkit() { + final Class toolkit; + try { + toolkit = Class.forName("sun.awt.windows.WToolkit"); + } catch (final ClassNotFoundException ignored) { + return; + } + try { + final Method displayChanged = toolkit.getMethod("displayChanged"); + displayChanged.invoke(Toolkit.getDefaultToolkit()); + } catch (final Exception e) { + e.printStackTrace(); + fail = true; + } + } +}