Mercurial > hg > release > icedtea6-1.13

changeset 3156:21a1b0e6077e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
S7183251: Netbeans editor renders text wrong on JDK 7u6 build 2014-05-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7183251-netbeans_renders_text_wrong.patch: Backport text layout fixes.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 15 Jul 2014 17:40:35 +0100
parents 3d9c006eaf4f
children a359fcb9891d
files ChangeLog Makefile.am NEWS patches/openjdk/7183251-netbeans_renders_text_wrong.patch
diffstat 4 files changed, 35 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 15 16:04:35 2014 +0100
+++ b/ChangeLog	Tue Jul 15 17:40:35 2014 +0100
@@ -1,3 +1,11 @@
+2014-05-28  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches.
+	* NEWS: Updated.
+	* patches/openjdk/7183251-netbeans_renders_text_wrong.patch:
+	Backport text layout fixes.
+
 2014-07-14  Omair Majid  <omajid@redhat.com>
 
 	* NEWS: Update with fixes.
--- a/Makefile.am	Tue Jul 15 16:04:35 2014 +0100
+++ b/Makefile.am	Tue Jul 15 17:40:35 2014 +0100
@@ -608,7 +608,8 @@
 	patches/shark_fixes_from_8003868.patch \
 	patches/8003992_support_6.patch \
 	patches/shark-drop_compile_method_arg_following_7083786.patch \
-	patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch
+	patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch \
+	patches/openjdk/7183251-netbeans_renders_text_wrong.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
--- a/NEWS	Tue Jul 15 16:04:35 2014 +0100
+++ b/NEWS	Tue Jul 15 17:40:35 2014 +0100
@@ -52,6 +52,7 @@
   - S8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader
 * Backports
  - S7027300, RH1098399: Unsynchronized HashMap access causes endless loop
+ - S7183251: Netbeans editor renders text wrong on JDK 7u6 build
 
 New in release 1.13.3 (2014-04-15):
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7183251-netbeans_renders_text_wrong.patch	Tue Jul 15 17:40:35 2014 +0100
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User prr
+# Date 1342804653 25200
+#      Fri Jul 20 10:17:33 2012 -0700
+# Node ID 84d5cdbe7bce2caf907ec842ac7b4fa2097fb295
+# Parent  bf5bf37108c14d1d01b8a1043f9e3ff0e3727869
+7183251: Netbeans editor renders text wrong on JDK 7u6 build
+Reviewed-by: igor, jgodinez
+
+diff -r bf5bf37108c1 -r 84d5cdbe7bce src/share/classes/sun/font/SunLayoutEngine.java
+--- openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java	Fri Jul 20 13:58:52 2012 +0400
++++ openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java	Fri Jul 20 10:17:33 2012 -0700
+@@ -137,8 +137,9 @@
+ 
+         LayoutEngine e = (LayoutEngine)cache.get(key);
+         if (e == null) {
+-            e = new SunLayoutEngine(key.copy());
+-            cache.put(key, e);
++            LayoutEngineKey copy = key.copy();
++            e = new SunLayoutEngine(copy);
++            cache.put(copy, e);
+         }
+         return e;
+     }