infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-04 05:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8166980: JCK testing of Window.setIconImage() leads to VM crash starting approx from JDK9 b134

Browse Source 
Reviewed-by: serb, rchamyal
This commit is contained in:
Ajit Ghaisas 2016-10-14 10:18:53 +05:30 committed by Ajit Ghaisas
parent cd11a435b1
commit b521b5b0d8
2 changed files with 97 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2016, 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
@ -103,7 +103,7 @@ public class IconInfo {
}
this.scaledWidth = width;
this.scaledHeight = height;
this.rawLength = getScaledRawLength();
this.rawLength = getScaledRawLength(width, height);
}
/*
@ -112,14 +112,14 @@ public class IconInfo {
public void setScaledSize(int width, int height) {
this.scaledWidth = width;
this.scaledHeight = height;
this.rawLength = getScaledRawLength();
this.rawLength = getScaledRawLength(width, height);
}
/*
* returns scaled raw length.
*/
private int getScaledRawLength() {
int scaledWidthAndHeight[] = getScaledWidthAndHeight(width, height);
private int getScaledRawLength(int w, int h) {
int scaledWidthAndHeight[] = getScaledWidthAndHeight(w, h);
return scaledWidthAndHeight[0] * scaledWidthAndHeight[1] + 2;
}

92
jdk/test/java/awt/Frame/SetIconImagesCrashTest/SetIconImagesCrashTest.java Normal file
View File

@ -0,0 +1,92 @@
/*
* Copyright (c) 2016, 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.
*/
/*
* @test
* @key headful
* @bug 8166980
* @summary Test to check Window.setIconImages() does not result in crash when
* a frame is shown
* @run main/othervm SetIconImagesCrashTest
* @run main/othervm -Dsun.java2d.uiScale=2 SetIconImagesCrashTest
*/
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Window;
import java.awt.Frame;
import java.util.List;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import javax.swing.SwingUtilities;
public class SetIconImagesCrashTest {
public static void main(String[] args) throws Exception {
List<BufferedImage> imageList = new ArrayList<BufferedImage>();
imageList.add(new BufferedImage(200, 200,
BufferedImage.TYPE_BYTE_BINARY));
for (int i = 0; i < 10; i++) {
Frame f = new Frame();
test(f, imageList);
}
}
public static void test(final Window window,
final List<BufferedImage> imageList) throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
for (BufferedImage image : imageList) {
Graphics graphics = image.getGraphics();
graphics.setColor(Color.RED);
graphics.fillRect(
0, 0, image.getWidth(), image.getHeight());
graphics.dispose();
}
window.setIconImages(imageList);
window.setSize(200, 200);
window.setVisible(true);
}
});
while (!window.isVisible()) {
Thread.sleep((long) (20));
}
Thread.sleep((long) (50));
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
window.setVisible(false);
window.dispose();
}
});
}
}