8014883: java.awt.container.add(component comp object constraints) doesn't work as expected on some linux platforms

Reviewed-by: jgodinez
This commit is contained in:
Phil Race 2013-08-07 18:24:17 -07:00
parent 2093cb052d
commit fcca48f761
2 changed files with 17 additions and 0 deletions
jdk
makefiles
src/solaris/native/sun/java2d/x11

@ -798,6 +798,16 @@ ifeq ($(OPENJDK_TARGET_OS),solaris)
LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
endif
ifeq ($(OPENJDK_TARGET_OS),linux)
ifndef OPENJDK
include $(JDK_TOPDIR)/make/closed/xawt.gmk
endif
ifeq ($(DISABLE_XRENDER),true)
LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
endif
endif
ifeq ($(MILESTONE),internal)
LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
endif

@ -269,6 +269,13 @@ Java_sun_awt_X11GraphicsEnvironment_initXRender
static jboolean firstTime = JNI_TRUE;
if (firstTime) {
#ifdef DISABLE_XRENDER_BY_DEFAULT
if (verbose == JNI_FALSE) {
xrenderAvailable = JNI_FALSE;
firstTime = JNI_FALSE;
return xrenderAvailable;
}
#endif
AWT_LOCK();
xrenderAvailable = IsXRenderAvailable(verbose);
AWT_UNLOCK();