Mercurial > hg > jdk9-shenandoah > jdk
changeset 2776:d147113a36fd
6982279: java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java failed due to NPE
Summary: Rely on the WWindowPeer.getTranslucentGraphics()'s return value
Reviewed-by: art, dcherepanov
author | anthony |
---|---|
date | Mon, 04 Oct 2010 16:21:26 +0400 |
parents | a014255d826c |
children | 63b6059eebd0 1b658b8bd49d |
files | src/windows/classes/sun/awt/windows/WComponentPeer.java src/windows/classes/sun/awt/windows/WWindowPeer.java |
diffstat | 2 files changed, 16 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WComponentPeer.java Mon Oct 04 16:12:07 2010 +0400 +++ b/src/windows/classes/sun/awt/windows/WComponentPeer.java Mon Oct 04 16:21:26 2010 +0400 @@ -556,24 +556,26 @@ Component target = (Component)getTarget(); Window window = SunToolkit.getContainingWindow(target); - if (window != null && !window.isOpaque()) { - // Non-opaque windows do not support heavyweight children. - // Redirect all painting to the Window's Graphics instead. - // The caller is responsible for calling the - // WindowPeer.updateWindow() after painting has finished. - int x = 0, y = 0; - for (Component c = target; c != window; c = c.getParent()) { - x += c.getX(); - y += c.getY(); - } - + if (window != null) { Graphics g = ((WWindowPeer)window.getPeer()).getTranslucentGraphics(); + // getTranslucentGraphics() returns non-null value for non-opaque windows only + if (g != null) { + // Non-opaque windows do not support heavyweight children. + // Redirect all painting to the Window's Graphics instead. + // The caller is responsible for calling the + // WindowPeer.updateWindow() after painting has finished. + int x = 0, y = 0; + for (Component c = target; c != window; c = c.getParent()) { + x += c.getX(); + y += c.getY(); + } - g.translate(x, y); - g.clipRect(0, 0, target.getWidth(), target.getHeight()); + g.translate(x, y); + g.clipRect(0, 0, target.getWidth(), target.getHeight()); - return g; + return g; + } } SurfaceData surfaceData = this.surfaceData;
--- a/src/windows/classes/sun/awt/windows/WWindowPeer.java Mon Oct 04 16:12:07 2010 +0400 +++ b/src/windows/classes/sun/awt/windows/WWindowPeer.java Mon Oct 04 16:21:26 2010 +0400 @@ -595,16 +595,6 @@ } @Override - public Graphics getGraphics() { - synchronized (getStateLock()) { - if (!isOpaque) { - return getTranslucentGraphics(); - } - } - return super.getGraphics(); - } - - @Override public void setBackground(Color c) { super.setBackground(c); synchronized (getStateLock()) {