8060461: Fix for JDK-8042609 uncovers additional issue

Reviewed-by: ahgross, prr, serb
This commit is contained in:
Alexander Zvegintsev 2014-11-11 17:36:43 +03:00
parent 4b6b14f69e
commit b8ae69575c

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2014, 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
@ -281,9 +281,7 @@ SplashCreateWindow(Splash * splash) {
/* for changing the visible shape of a window to an nonrectangular form */
void
SplashUpdateShape(Splash * splash) {
if (!shapeSupported)
return;
if (!splash->maskRequired) {
if (splash->currentFrame < 0 || !shapeSupported || !splash->maskRequired) {
return;
}
XShapeCombineRectangles(splash->display, splash->window, ShapeClip, 0, 0,
@ -324,6 +322,10 @@ ByteOrderToX(int byteOrder) {
void
SplashRedrawWindow(Splash * splash) {
if (splash->currentFrame < 0) {
return;
}
XImage *ximage;
// making this method redraw a part of the image does not make