/hg/icedtea6: Fix a memory leak in the XRender pipeline.

[andrew at icedtea.classpath.org]

changeset c3803fc3edac in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c3803fc3edac
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Nov 19 22:23:15 2010 +0000

	Fix a memory leak in the XRender pipeline.

	2010-11-19 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add new patch.
		* patches/xrender-gc-cleanup.patch: Fix memory leak in XRender
	pipeline.


diffstat:

3 files changed, 20 insertions(+), 1 deletion(-)
ChangeLog                        |    6 ++++++
Makefile.am                      |    3 ++-
patches/xrender-gc-cleanup.patch |   12 ++++++++++++

diffs (42 lines):

diff -r 8ab7d435a672 -r c3803fc3edac ChangeLog
--- a/ChangeLog	Fri Nov 19 13:35:01 2010 +0000
+++ b/ChangeLog	Fri Nov 19 22:23:15 2010 +0000
@@ -1,3 +1,9 @@ 2010-11-19  Andrew John Hughes  <ahughes
+2010-11-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/xrender-gc-cleanup.patch:
+	Fix memory leak in XRender pipeline.
+
 2010-11-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 8ab7d435a672 -r c3803fc3edac Makefile.am
--- a/Makefile.am	Fri Nov 19 13:35:01 2010 +0000
+++ b/Makefile.am	Fri Nov 19 22:23:15 2010 +0000
@@ -349,7 +349,8 @@ ICEDTEA_PATCHES += patches/openjdk/67252
 	patches/openjdk/6961633-xrender-02.patch \
         patches/openjdk/6791612-opengl-jni-fix.patch \
         patches/openjdk/6755274-glgetstring-crash.patch \
-        patches/openjdk/6984543-onscreen_rendering_resize_test.patch
+        patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
+	patches/xrender-gc-cleanup.patch
 endif
 
 if ENABLE_NIO2
diff -r 8ab7d435a672 -r c3803fc3edac patches/xrender-gc-cleanup.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/xrender-gc-cleanup.patch	Fri Nov 19 22:23:15 2010 +0000
@@ -0,0 +1,12 @@
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java	2010-10-22 19:59:12.530975783 +0200
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java	2010-10-22 19:59:12.020734687 +0200
+@@ -479,8 +485,7 @@
+         if (xrpipe == null) {
+             try {
+                 SunToolkit.awtLock();
+-                xgc = renderQueue.createGC(xid); // TODO: GC leak? where to
+-                // clean up?
++                xgc = XCreateGC(getNativeOps());
+ 
+                 xrpipe = new XRRenderer(maskBuffer.getMaskBuffer());
+                 xrtxpipe = new PixelToShapeConverter(xrpipe);