/hg/icedtea6: Backport S7018387: Xrender pipeline may leak GC's

[omajid at icedtea.classpath.org]

changeset e12e69d3e09c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e12e69d3e09c
author: Omair Majid <omajid at redhat.com>
date: Tue May 03 17:58:19 2011 -0400

	Backport S7018387: Xrender pipeline may leak GC's

	Replace patches/xrender-gc-cleanup.patch with identical but
	upstreamed fix patches/openjdk/7018387-xrender_gc_leak.patch


diffstat:

 ChangeLog                                     |   9 +++++++++
 Makefile.am                                   |   2 +-
 NEWS                                          |   1 +
 patches/openjdk/7018387-xrender_gc_leak.patch |  20 ++++++++++++++++++++
 patches/xrender-gc-cleanup.patch              |  11 -----------
 5 files changed, 31 insertions(+), 12 deletions(-)

diffs (80 lines):

diff -r b6472fccd0ec -r e12e69d3e09c ChangeLog
--- a/ChangeLog	Tue May 03 13:05:05 2011 +0100
+++ b/ChangeLog	Tue May 03 17:58:19 2011 -0400
@@ -1,3 +1,12 @@
+2011-05-03  Omair Majid  <omajid at redhat.com>
+
+	Replace xrender patch with (identical) upstream fix.
+	* NEWS: Document backport of S7018387.
+	* Makefile.am (ICEDTEA_PATCHES): Replace patches/xrender-gc-cleanup.patch
+	with patches/openjdk/7018387-xrender_gc_leak.patch.
+	* patches/openjdk/7018387-xrender_gc_leak.patch: New file.
+	* patches/xrender-gc-cleanup.patch: Remove.
+
 2011-05-03  Andrew Haley  <aph at redhat.com>
 
 	* Makefile.am: Don't fail if sed command to clean jvm.cfg fails.
diff -r b6472fccd0ec -r e12e69d3e09c Makefile.am
--- a/Makefile.am	Tue May 03 13:05:05 2011 +0100
+++ b/Makefile.am	Tue May 03 17:58:19 2011 -0400
@@ -384,7 +384,7 @@
 if ENABLE_XRENDER
 ICEDTEA_PATCHES += patches/openjdk/6307603-xrender-01.patch \
 	patches/openjdk/6961633-xrender-02.patch \
-	patches/xrender-gc-cleanup.patch
+	patches/openjdk/7018387-xrender_gc_leak.patch
 endif
 
 if ENABLE_NIO2
diff -r b6472fccd0ec -r e12e69d3e09c NEWS
--- a/NEWS	Tue May 03 13:05:05 2011 +0100
+++ b/NEWS	Tue May 03 17:58:19 2011 -0400
@@ -22,6 +22,7 @@
   - S6708580: Java applications slow when EXA enabled
   - S7029905: demo applets missing some html files
   - S6986968: Crash on XIM server restart
+  - S7018387: Xrender pipeline may leak GC's
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - G356743: Support libpng 1.5.
diff -r b6472fccd0ec -r e12e69d3e09c patches/openjdk/7018387-xrender_gc_leak.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7018387-xrender_gc_leak.patch	Tue May 03 17:58:19 2011 -0400
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User ceisserer
+# Date 1297290844 28800
+# Node ID 37d20456c54c11402b4c62c6f4d7a50b563c1308
+# Parent  d42ce0b309ae19742cd509dfbadba37d868b592f
+7018387: Xrender pipeline may leak GC's
+Reviewed-by: prr
+
+diff -r d42ce0b309ae -r 37d20456c54c src/solaris/classes/sun/java2d/xr/XRSurfaceData.java
+--- openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java	Wed Feb 09 22:24:42 2011 +0300
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java	Wed Feb 09 14:34:04 2011 -0800
+@@ -479,8 +479,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);
diff -r b6472fccd0ec -r e12e69d3e09c patches/xrender-gc-cleanup.patch
--- a/patches/xrender-gc-cleanup.patch	Tue May 03 13:05:05 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- 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);