/hg/icedtea6: 6693253: Security warning backport.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 17 13:44:38 PST 2011
changeset 2d689773ef17 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2d689773ef17
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 17 21:44:24 2011 +0000
6693253: Security warning backport.
2011-02-17 Andrew John Hughes <ahughes at redhat.com>
6693253: Security Warning appearance requires enhancements
6779717: A Window does not show applet security warning icon on X
platforms 6785058: Parent don't get the focus after dialog
is closed if security warning is applied
* Makefile.am: Add new patch.
* patches/openjdk/6307603-xrender-01.patch: Rejigged.
* patches/openjdk/6693253-security_warning.patch: Security
warning backport.
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
bw16.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
bw24.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
bw32.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
bw48.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
interim16.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
interim24.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
interim32.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
interim48.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
yellow16.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
yellow24.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
yellow32.png,
* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
yellow48.png,
* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning
.ico,
* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning
_bw.ico,
* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning
_int.ico: Images for new backport.
* NEWS: Updated.
diffstat:
5 files changed, 5534 insertions(+), 100 deletions(-)
ChangeLog | 27
Makefile.am | 1
NEWS | 3
patches/openjdk/6307603-xrender-01.patch | 200
patches/openjdk/6693253-security_warning.patch | 5403 ++++++++++++++++++++++++
diffs (truncated from 6192 to 500 lines):
diff -r 34511f89bc1d -r 2d689773ef17 ChangeLog
--- a/ChangeLog Thu Feb 17 12:09:44 2011 -0500
+++ b/ChangeLog Thu Feb 17 21:44:24 2011 +0000
@@ -1,3 +1,30 @@ 2011-02-16 Denis Lila <dlila at redhat.com
+2011-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ 6693253: Security Warning appearance requires enhancements
+ 6779717: A Window does not show applet security warning icon on X platforms
+ 6785058: Parent don't get the focus after dialog is closed if security warning is applied
+ * Makefile.am: Add new patch.
+ * patches/openjdk/6307603-xrender-01.patch: Rejigged.
+ * patches/openjdk/6693253-security_warning.patch:
+ Security warning backport.
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw16.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw24.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw32.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw48.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim16.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim24.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim32.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim48.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png,
+ * overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png,
+ * overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning.ico,
+ * overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_bw.ico,
+ * overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_int.ico:
+ Images for new backport.
+ * NEWS: Updated.
+
2011-02-16 Denis Lila <dlila at redhat.com>
* NEWS: Update with the backports
diff -r 34511f89bc1d -r 2d689773ef17 Makefile.am
--- a/Makefile.am Thu Feb 17 12:09:44 2011 -0500
+++ b/Makefile.am Thu Feb 17 21:44:24 2011 +0000
@@ -199,6 +199,7 @@ ICEDTEA_PATCHES = \
patches/openjdk/6791612-opengl-jni-fix.patch \
patches/openjdk/6755274-glgetstring-crash.patch \
patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
+ patches/openjdk/6693253-security_warning.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
diff -r 34511f89bc1d -r 2d689773ef17 NEWS
--- a/NEWS Thu Feb 17 12:09:44 2011 -0500
+++ b/NEWS Thu Feb 17 21:44:24 2011 +0000
@@ -421,6 +421,9 @@ New in release 1.10 (2011-XX-XX):
- PR632: patches/security/20110215/6878713.patch breaks shark zero build
- S6749060: LCD AA text rendered incorrectly when destination is non opaque (sw pipeline only)
- S6728834: D3D/OGL: LCD AA text becomes bold and blurred when rendering to a non-opaque destination
+ - S6693253: Security Warning appearance requires enhancements
+ - S6779717: A Window does not show applet security warning icon on X platforms
+ - S6785058: Parent don't get the focus after dialog is closed if security warning is applied
* Bug fixes
- RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
- PR616, PR99: Don't statically link libstdc++ or libgcc
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw16.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw16.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw24.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw24.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw32.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw32.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw48.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw48.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim16.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim16.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim24.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim24.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim32.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim32.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim48.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim48.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png
Binary file overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning.ico
Binary file overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning.ico has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_bw.ico
Binary file overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_bw.ico has changed
diff -r 34511f89bc1d -r 2d689773ef17 overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_int.ico
Binary file overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_int.ico has changed
diff -r 34511f89bc1d -r 2d689773ef17 patches/openjdk/6307603-xrender-01.patch
--- a/patches/openjdk/6307603-xrender-01.patch Thu Feb 17 12:09:44 2011 -0500
+++ b/patches/openjdk/6307603-xrender-01.patch Thu Feb 17 21:44:24 2011 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers
---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2010-08-03 23:17:50.464917097 +0100
-@@ -311,6 +311,7 @@
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2011-02-17 16:00:41.000000000 +0000
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2011-02-17 16:52:48.186147394 +0000
+@@ -312,6 +312,7 @@
Java_sun_awt_X11GraphicsEnvironment_initGLX;
Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
@@ -9,7 +9,7 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/
#Java_sun_awt_motif_MEmbedCanvasPeer_initXEmbedServer;
#Java_sun_awt_motif_MEmbedCanvasPeer_destroyXEmbedServer;
#Java_sun_awt_motif_MEmbedCanvasPeer_isXEmbedActive;
-@@ -405,17 +406,52 @@
+@@ -406,17 +407,52 @@
Java_sun_java2d_x11_X11SurfaceData_initIDs;
Java_sun_java2d_x11_X11SurfaceData_initOps;
Java_sun_java2d_x11_X11SurfaceData_initSurface;
@@ -70,9 +70,9 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/
Java_sun_java2d_opengl_OGLContext_getOGLIdString;
Java_sun_java2d_opengl_OGLMaskFill_maskFill;
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux
---- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2010-08-03 23:17:50.464917097 +0100
-@@ -425,6 +425,7 @@
+--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2011-02-17 16:00:41.000000000 +0000
++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2011-02-17 16:52:48.186147394 +0000
+@@ -426,6 +426,7 @@
Java_sun_awt_X11GraphicsEnvironment_initDisplay;
Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
@@ -81,8 +81,8 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/
diff -Nru openjdk.orig/jdk/make/sun/headless/mapfile-vers openjdk/jdk/make/sun/headless/mapfile-vers
---- openjdk.orig/jdk/make/sun/headless/mapfile-vers 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/make/sun/headless/mapfile-vers 2010-08-03 23:17:50.476916584 +0100
+--- openjdk.orig/jdk/make/sun/headless/mapfile-vers 2011-02-17 16:00:33.000000000 +0000
++++ openjdk/jdk/make/sun/headless/mapfile-vers 2011-02-17 16:52:48.186147394 +0000
@@ -46,17 +46,20 @@
Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
Java_sun_java2d_x11_X11Renderer_devCopyArea;
@@ -111,8 +111,8 @@ diff -Nru openjdk.orig/jdk/make/sun/head
Java_java_awt_Font_initIDs;
Java_sun_font_FontManager_getFontConfig;
diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
---- openjdk.orig/jdk/make/sun/jawt/Makefile 2010-08-03 23:14:58.000000000 +0100
-+++ openjdk/jdk/make/sun/jawt/Makefile 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/make/sun/jawt/Makefile 2011-02-17 16:00:41.000000000 +0000
++++ openjdk/jdk/make/sun/jawt/Makefile 2011-02-17 16:52:48.198146458 +0000
@@ -118,7 +118,7 @@
# Libraries to link in.
#
@@ -123,20 +123,20 @@ diff -Nru openjdk.orig/jdk/make/sun/jawt
ifeq ($(PLATFORM), linux)
diff -Nru openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk
---- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-06-21 22:15:09.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-08-03 23:17:50.480916320 +0100
-@@ -78,4 +78,7 @@
- awt_Plugin.c \
+--- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2011-02-17 16:00:41.000000000 +0000
++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2011-02-17 16:53:14.908062495 +0000
+@@ -79,4 +79,7 @@
gtk2_interface.c \
swing_GTKEngine.c \
-- swing_GTKStyle.c
-+ swing_GTKStyle.c \
+ swing_GTKStyle.c \
+- rect.c
++ rect.c \
+ XRSurfaceData.c \
+ XRBackendNative.c
+
diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
---- openjdk.orig/jdk/make/sun/xawt/Makefile 2010-06-21 22:15:09.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/Makefile 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2011-02-17 16:00:41.000000000 +0000
++++ openjdk/jdk/make/sun/xawt/Makefile 2011-02-17 16:52:48.198146458 +0000
@@ -48,6 +48,11 @@
LDFLAGS += -L$(OPENWIN_LIB)
@@ -149,7 +149,7 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
ifeq ($(PLATFORM), linux)
LDFLAGS += -lpthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-@@ -86,7 +91,7 @@
+@@ -87,7 +92,7 @@
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
@@ -158,7 +158,7 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
$(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
ifeq ($(PLATFORM), solaris)
-@@ -120,7 +125,7 @@
+@@ -121,7 +126,7 @@
-I$(PLATFORM_SRC)/native/sun/awt/medialib \
-I$(PLATFORM_SRC)/native/sun/font \
-I$(SHARE_SRC)/native/sun/awt \
@@ -168,9 +168,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
ifeq ($(PLATFORM), linux)
# Allows for builds on Debian GNU Linux, X11 is in a different place
diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers
---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-03 23:17:50.480916320 +0100
-@@ -184,6 +184,7 @@
+--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2011-02-17 16:00:41.000000000 +0000
++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2011-02-17 16:52:48.198146458 +0000
+@@ -186,6 +186,7 @@
Java_sun_font_FontManager_populateFontFileNameMap;
Java_sun_awt_X11GraphicsEnvironment_initDisplay;
Java_sun_awt_X11GraphicsEnvironment_initGLX;
@@ -178,7 +178,7 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
-@@ -332,20 +333,51 @@
+@@ -337,20 +338,51 @@
Java_sun_java2d_x11_X11Renderer_XFillRect;
Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
Java_sun_java2d_x11_X11Renderer_devCopyArea;
@@ -240,7 +240,7 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt
Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java
--- openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 2010-08-03 23:17:50.480916320 +0100
++++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 2011-02-17 16:52:48.198146458 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -275,8 +275,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+ public void glyphDisposed(ArrayList<Long> glyphs);
+}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java openjdk/jdk/src/share/classes/sun/font/StrikeCache.java
---- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java 2010-08-03 23:25:03.054323484 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java 2011-02-17 16:00:33.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java 2011-02-17 16:52:48.198146458 +0000
@@ -31,6 +31,7 @@
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
@@ -438,8 +438,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
public static Reference getStrikeRef(FontStrike strike) {
return getStrikeRef(strike, cacheRefTypeWeak);
diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2010-06-21 22:15:29.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2011-01-20 23:54:26.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2011-02-17 16:52:48.198146458 +0000
@@ -307,7 +307,7 @@
* linear RGB space. Copied directly from the
* MultipleGradientPaintContext class.
@@ -450,8 +450,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
input = color / 255.0f;
diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2010-06-21 22:15:29.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2011-01-20 23:54:26.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2011-02-17 16:52:48.198146458 +0000
@@ -131,6 +131,11 @@
curAddress = baseAddress;
}
@@ -465,8 +465,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
* putByte() methods...
*/
diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2010-06-21 22:15:29.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2011-01-20 23:54:26.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2011-02-17 16:52:48.198146458 +0000
@@ -1,2 +1,5 @@
+# Jules Rendering Engine module
+sun.java2d.jules.JulesRenderingEngine
@@ -476,8 +476,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+sun.java2d.pisces.PiscesRenderingEngine
\ No newline at end of file
diff -Nru openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c
---- openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-08-03 23:18:20.208668761 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-02-17 16:00:33.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-02-17 16:52:48.198146458 +0000
@@ -325,6 +325,7 @@
cellInfo->glyphInfo = glyph;
cellInfo->nextGCI = glyph->cellInfo;
@@ -487,8 +487,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
/**
diff -Nru openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h
---- openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h 2010-06-21 22:15:41.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h 2011-01-20 23:54:38.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h 2011-02-17 16:52:48.198146458 +0000
@@ -84,15 +84,26 @@
#define t2kScalarAverage(a, b) (((a) + (b)) / (t2kScalar)(2))
@@ -518,8 +518,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
} GlyphInfo;
diff -Nru openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c openjdk/jdk/src/share/native/sun/font/freetypeScaler.c
---- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c 2010-08-03 23:14:58.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c 2011-02-17 16:00:43.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c 2011-02-17 16:52:48.198146458 +0000
@@ -783,6 +783,7 @@
return ptr_to_jlong(glyphInfo);
}
@@ -538,8 +538,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
point; and a second-order control point if unset. */
current_type = SEG_CUBICTO;
diff -Nru openjdk.orig/jdk/src/share/native/sun/font/sunFont.c openjdk/jdk/src/share/native/sun/font/sunFont.c
---- openjdk.orig/jdk/src/share/native/sun/font/sunFont.c 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/font/sunFont.c 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/native/sun/font/sunFont.c 2011-02-17 16:00:33.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/font/sunFont.c 2011-02-17 16:52:48.198146458 +0000
@@ -294,7 +294,8 @@
for (i=0; i< len; i++) {
if (ptrs[i] != 0) {
@@ -570,8 +570,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-21 22:15:42.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-01-20 23:54:39.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-02-17 16:52:48.198146458 +0000
@@ -244,6 +244,7 @@
OGLTR_AddToGlyphCache(GlyphInfo *glyph, jboolean rgbOrder)
{
@@ -614,8 +614,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
// location of the glyph in the destination's coordinate space
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2010-08-03 23:14:59.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2011-02-17 16:00:33.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2011-02-17 16:52:48.198146458 +0000
@@ -37,6 +37,7 @@
import java.util.HashMap;
@@ -677,8 +677,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
}
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-06-21 22:15:43.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-08-03 23:17:50.480916320 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2011-01-20 23:54:40.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2011-02-17 16:52:48.198146458 +0000
@@ -26,6 +26,7 @@
package sun.awt;
@@ -763,7 +763,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
* Returns:
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java
--- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 2010-08-03 23:17:50.480916320 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 2011-02-17 16:52:48.198146458 +0000
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -973,7 +973,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java
--- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 2010-08-03 23:17:50.480916320 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -1278,7 +1278,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java
--- openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -1434,7 +1434,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -1547,7 +1547,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,349 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -1900,7 +1900,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,271 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -2175,7 +2175,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -2233,7 +2233,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -2339,7 +2339,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -2410,7 +2410,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -2560,7 +2560,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
@@ -2673,8 +2673,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+ }
+}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java
---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2010-06-21 22:15:44.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2010-08-03 23:17:50.484916824 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2011-01-20 23:54:41.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2011-02-17 16:52:48.202146146 +0000
@@ -34,6 +34,8 @@
import sun.java2d.opengl.GLXGraphicsConfig;
import sun.java2d.opengl.GLXVolatileSurfaceManager;
@@ -2703,8 +2703,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
return new X11VolatileSurfaceManager(vImg, context);
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java
---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2010-06-21 22:15:44.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2010-08-03 23:17:50.484916824 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2011-02-17 16:00:43.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2011-02-17 16:52:48.202146146 +0000
@@ -46,6 +46,7 @@
import sun.awt.SunToolkit;
import sun.awt.X11ComponentPeer;
@@ -2750,7 +2750,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
}
/**
-@@ -402,11 +402,11 @@
+@@ -405,11 +405,11 @@
cm, drawable, transparency);
}
@@ -2767,7 +2767,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
protected X11SurfaceData(X11ComponentPeer peer,
X11GraphicsConfig gc,
-@@ -565,8 +565,6 @@
+@@ -568,8 +568,6 @@
return sType;
}
@@ -2776,7 +2776,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
public void invalidate() {
if (isValid()) {
setInvalid();
-@@ -580,16 +578,9 @@
+@@ -583,16 +581,9 @@
* X11SurfaceData object.
*/
@@ -2795,7 +2795,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
private Region validatedClip;
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java
--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 2010-08-03 23:17:50.484916824 +0100
++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 2011-02-17 16:52:48.202146146 +0000
@@ -0,0 +1,40 @@
More information about the distro-pkg-dev
mailing list