stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8227392: Colors with alpha are painted incorrectly on Linux, after JDK-8214579

Browse Source 
8224825: java/awt/Color/AlphaColorTest.java fails in linux-x64 system

Reviewed-by: prr
This commit is contained in:
Anton Litvinov 2019-07-16 15:15:45 +01:00
parent c0d870559f
commit cf5433ff56
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -54,7 +54,6 @@ import sun.java2d.pipe.Region;
import sun.java2d.pipe.ShapeDrawPipe; import sun.java2d.pipe.ShapeDrawPipe;
import sun.java2d.pipe.TextPipe; import sun.java2d.pipe.TextPipe;
import sun.java2d.pipe.ValidatePipe; import sun.java2d.pipe.ValidatePipe;
import sun.java2d.x11.X11SurfaceData;
import sun.java2d.x11.XSurfaceData; import sun.java2d.x11.XSurfaceData;
import sun.font.FontManagerNativeLibrary; import sun.font.FontManagerNativeLibrary;
@ -244,7 +243,7 @@ public abstract class XRSurfaceData extends XSurfaceData {
*/ */
public static XRWindowSurfaceData createData(X11ComponentPeer peer) { public static XRWindowSurfaceData createData(X11ComponentPeer peer) {
XRGraphicsConfig gc = getGC(peer); XRGraphicsConfig gc = getGC(peer);
return new XRWindowSurfaceData(peer, gc, X11SurfaceData.getSurfaceType(gc, Transparency.OPAQUE)); return new XRWindowSurfaceData(peer, gc, gc.getSurfaceType());
} }
/** /**

1
test/jdk/ProblemList.txt
View File

@ -114,7 +114,6 @@
# jdk_awt # jdk_awt
java/awt/Color/AlphaColorTest.java 8224825 linux-all
java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java 8168389 windows-all,macosx-all java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java 8168389 windows-all,macosx-all
java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java 8224055 macosx-all java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java 8224055 macosx-all
java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java 8168408 windows-all,macosx-all java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java 8168408 windows-all,macosx-all

14
test/jdk/java/awt/Color/AlphaColorTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,7 @@
/** /**
* @test * @test
* @key headful * @key headful
* @bug 8204931 * @bug 8204931 8227392 8224825
* @summary test alpha colors are blended with background. * @summary test alpha colors are blended with background.
*/ */
@ -73,8 +73,14 @@ public class AlphaColorTest extends Component {
static Frame frame; static Frame frame;
private static void createAndShowGUI() { private static void createAndShowGUI() {
frame = new Frame("Alpha Color Test"); frame = new Frame("Alpha Color Test") {
frame.setBackground(Color.black); @Override
public void paint(Graphics g) {
g.setColor(Color.black);
g.fillRect(0, 0, getWidth(), getHeight());
super.paint(g);
}
};
Color color = new Color(255, 255, 255, 127); Color color = new Color(255, 255, 255, 127);
frame.add("Center", new AlphaColorTest(color)); frame.add("Center", new AlphaColorTest(color));
frame.pack(); frame.pack();