changeset in /hg/icedtea: Merge from IcedTea6.
Andrew John Hughes
gnu_andrew at member.fsf.org
Thu Dec 4 06:11:25 PST 2008
changeset 6b24535880de in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6b24535880de
description:
Merge from IcedTea6.
2008-12-02 Andrew John Hughes <ahughes at redhat.com>
Merge from IcedTea6.
* .hgignore,
* ChangeLog,
* HACKING,
* IcedTeaPlugin.cc,
* Makefile.am,
* autogen.sh,
* configure.ac,
* javac.in,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java,
* overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java: Merged.
* patches/icedtea-4486841.patch,
* patches/icedtea-6484091.patch,
* patches/icedtea-6497740.patch,
* patches/icedtea-6588160.patch,
* patches/icedtea-6592792.patch,
* patches/icedtea-6721753.patch,
* patches/icedtea-6726779.patch,
* patches/icedtea-6728542-epoll.patch,
* patches/icedtea-6733959.patch,
* patches/icedtea-6734167.patch,
* patches/icedtea-6755943.patch,
* patches/icedtea-6766136.patch,
* patches/icedtea-ecj-pr261.patch,
* patches/icedtea-samejvm-safe.patch,
* patches/icedtea-stroker-finish.patch,
* patches/icedtea-xrender-000.patch,
* patches/icedtea-xrender-001.patch,
* patches/icedtea-xrender-002.patch,
* patches/icedtea-xrender-003.patch,
* patches/icedtea-xrender-004.patch,
* patches/icedtea-xrender-005.patch,
* patches/icedtea-xrender-006.patch,
* patches/icedtea-xrender-007.patch,
* patches/icedtea-xrender-008.patch,
* patches/icedtea-xrender-009.patch: Added.
* plugin/icedtea/netscape/javascript/JSObject.java,
* plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java,
* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
* plugin/icedtea/sun/applet/PluginAppletViewer.java,
* plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java,
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
* ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp,
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
* ports/hotspot/src/share/vm/shark/sharkValue.hpp,
* test/jtreg/com/sun/javatest/regtest/Main.java,
* test/jtreg/com/sun/javatest/regtest/RegressionParameters.java,
* test/jtreg/com/sun/javatest/regtest/RegressionScript.java: Merged.
diffstat:
62 files changed, 19832 insertions(+), 162 deletions(-)
.hgignore | 1
ChangeLog | 238
HACKING | 14
IcedTeaPlugin.cc | 128
Makefile.am | 30
autogen.sh | 4
configure.ac | 19
javac.in | 4
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java | 7
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 5
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 11
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java | 11
overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 59
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java | 107
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java | 104
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java | 129
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java | 106
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java | 117
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java | 118
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java | 118
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java | 131
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 207
overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 99
patches/icedtea-4486841.patch | 1234 ++
patches/icedtea-6484091.patch | 129
patches/icedtea-6497740.patch | 1589 ++
patches/icedtea-6588160.patch | 42
patches/icedtea-6592792.patch | 360
patches/icedtea-6721753.patch | 117
patches/icedtea-6726779.patch | 142
patches/icedtea-6728542-epoll.patch | 90
patches/icedtea-6733959.patch | 223
patches/icedtea-6734167.patch | 89
patches/icedtea-6755943.patch | 617 +
patches/icedtea-6766136.patch | 189
patches/icedtea-ecj-pr261.patch | 40
patches/icedtea-samejvm-safe.patch | 12
patches/icedtea-stroker-finish.patch | 20
patches/icedtea-xrender-000.patch | 430
patches/icedtea-xrender-001.patch | 5320 ++++++++++
patches/icedtea-xrender-002.patch | 5199 +++++++++
patches/icedtea-xrender-003.patch | 78
patches/icedtea-xrender-004.patch | 86
patches/icedtea-xrender-005.patch | 18
patches/icedtea-xrender-006.patch | 295
patches/icedtea-xrender-007.patch | 1143 ++
patches/icedtea-xrender-008.patch | 131
patches/icedtea-xrender-009.patch | 170
plugin/icedtea/netscape/javascript/JSObject.java | 7
plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java | 6
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java | 2
plugin/icedtea/sun/applet/PluginAppletViewer.java | 308
plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java | 27
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 8
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 2
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 8
ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp | 8
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 2
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 4
test/jtreg/com/sun/javatest/regtest/Main.java | 36
test/jtreg/com/sun/javatest/regtest/RegressionParameters.java | 20
test/jtreg/com/sun/javatest/regtest/RegressionScript.java | 26
diffs (truncated from 21059 to 500 lines):
diff -r d8e977068163 -r 6b24535880de .hgignore
--- a/.hgignore Fri Nov 21 10:29:58 2008 +0000
+++ b/.hgignore Tue Dec 02 13:58:24 2008 +0000
@@ -38,6 +38,7 @@ test/langtools
test/langtools
test/jtreg.jar
test/jtreg/classes
+test/jtreg-summary.log
test/check-.*log
rt/com/sun/jdi/AbsentInformationException.java
rt/com/sun/jdi/Accessible.java
diff -r d8e977068163 -r 6b24535880de ChangeLog
--- a/ChangeLog Fri Nov 21 10:29:58 2008 +0000
+++ b/ChangeLog Tue Dec 02 13:58:24 2008 +0000
@@ -1,3 +1,126 @@ 2008-11-21 Andrew John Hughes <ahughes
+2008-12-02 Andrew John Hughes <ahughes at redhat.com>
+
+ Merge from IcedTea6.
+ * .hgignore,
+ * ChangeLog,
+ * HACKING,
+ * IcedTeaPlugin.cc,
+ * Makefile.am,
+ * autogen.sh,
+ * configure.ac,
+ * javac.in,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java,
+ * overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java: Merged.
+ * patches/icedtea-4486841.patch,
+ * patches/icedtea-6484091.patch,
+ * patches/icedtea-6497740.patch,
+ * patches/icedtea-6588160.patch,
+ * patches/icedtea-6592792.patch,
+ * patches/icedtea-6721753.patch,
+ * patches/icedtea-6726779.patch,
+ * patches/icedtea-6728542-epoll.patch,
+ * patches/icedtea-6733959.patch,
+ * patches/icedtea-6734167.patch,
+ * patches/icedtea-6755943.patch,
+ * patches/icedtea-6766136.patch,
+ * patches/icedtea-ecj-pr261.patch,
+ * patches/icedtea-samejvm-safe.patch,
+ * patches/icedtea-stroker-finish.patch,
+ * patches/icedtea-xrender-000.patch,
+ * patches/icedtea-xrender-001.patch,
+ * patches/icedtea-xrender-002.patch,
+ * patches/icedtea-xrender-003.patch,
+ * patches/icedtea-xrender-004.patch,
+ * patches/icedtea-xrender-005.patch,
+ * patches/icedtea-xrender-006.patch,
+ * patches/icedtea-xrender-007.patch,
+ * patches/icedtea-xrender-008.patch,
+ * patches/icedtea-xrender-009.patch: Added.
+ * plugin/icedtea/netscape/javascript/JSObject.java,
+ * plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java,
+ * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java,
+ * plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java,
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp,
+ * test/jtreg/com/sun/javatest/regtest/Main.java,
+ * test/jtreg/com/sun/javatest/regtest/RegressionParameters.java,
+ * test/jtreg/com/sun/javatest/regtest/RegressionScript.java: Merged.
+
+2008-12-02 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_PATCHES): Added new OpenJDK security patches.
+ * patches/icedtea-4486841.patch,
+ patches/icedtea-6484091.patch,
+ patches/icedtea-6497740.patch,
+ patches/icedtea-6588160.patch,
+ patches/icedtea-6592792.patch,
+ patches/icedtea-6721753.patch,
+ patches/icedtea-6726779.patch,
+ patches/icedtea-6733959.patch,
+ patches/icedtea-6734167.patch,
+ patches/icedtea-6755943.patch,
+ patches/icedtea-6766136.patch: New file
+
+2008-11-30 Mark Wielaard <mark at klomp.org>
+
+ * patches/icedtea-xrender-001.patch: Remove !xrender bug fix.
+ * patches/icedtea-xrender-009.patch: New upstream patch, includes
+ bug fix.
+
+2008-11-30 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
+ * javac.in: Use ecj binary if available and no native-ecj.
+
+2008-11-29 Mark Wielaard <mark at klomp.org>
+
+ * configure.ac: Add and check --enable-xrender.
+ * Makefile.am: Add XRENDER_PATCHES when ENABLE_XRENDER set.
+ * patches/icedtea-xrender-00[0-8].patch: New patches.
+ * HACKING: Document new patches.
+
+2008-11-28 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/265:
+ * patches/icedtea-6728542-epoll.patch: New file.
+ * Makefile.am (ICEDTEA_PATCHES): Apply the above.
+ * HACKING: Document the above.
+
+2008-11-28 Gary Benson <gbenson at redhat.com>
+
+ PR icedtea/261:
+ * patches/icedtea-ecj-pr261.patch: New file.
+ * Makefile.am (ICEDTEA_ECJ_PATCHES): Apply the above.
+ * HACKING: Document the above.
+
+2008-11-28 Mark Wielaard <mark at klomp.org>
+
+ * autogen.sh: Check for autoconf > 2.61.
+ * configure.ac: Remove AC_PREREQ([2.61]).
+
+2008-11-26 Mark Wielaard <mark at klomp.org>
+
+ * .hgignore: Add test/jtreg-summary.log.
+
2008-11-21 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -16,7 +139,6 @@ 2008-11-20 Andrew John Hughes <ahughes
* configure.ac: Bump to 1.8.
2008-11-20 Andrew John Hughes <ahughes at redhat.com>
-
PR icedtea/236:
* gcjwebplugin.cc,
* Makefile.am,
@@ -139,6 +261,120 @@ 2008-11-17 Andrew John Hughes <ahughes
* test/jtreg/excludelist.jdk.jtx,
* test/jtreg/excludelist.langtools.jtx:
Exclude broken tests.
+
+2008-11-25 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (jtregcheck): Fix regexp.
+
+2008-11-24 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (jtregcheck): Clean up jtreg-summary.log a bit more.
+
+2008-11-24 Mark Wielaard <mark at klomp.org>
+
+ * overlays/openjdk/jdk/test/com/sun/media/sound/
+ EmergencySoundbank/TestCreateSoundbank.java
+ ModelByteBuffer/RandomFileInputStream/Available.java
+ ModelByteBuffer/RandomFileInputStream/Close.java
+ ModelByteBuffer/RandomFileInputStream/MarkReset.java
+ ModelByteBuffer/RandomFileInputStream/MarkSupported.java
+ ModelByteBuffer/RandomFileInputStream/Read.java
+ ModelByteBuffer/RandomFileInputStream/ReadByte.java
+ ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
+ ModelByteBuffer/RandomFileInputStream/Skip.java
+ SoftAudioSynthesizer/DummySourceDataLine.java
+ SoftFilter/TestProcessAudio.java
+ SoftSynthesizer/DummySourceDataLine.java: Add missing Gervill
+ test files.
+
+2008-11-23 Mark Wielaard <mark at klomp.org>
+
+ * patches/icedtea-samejvm-safe.patch: New patch.
+ * Makefile.am (ICEDTEA_PATCHES): Add new patch.
+ (check-jdk): Run jtreg with -samevm.
+ * HACKING: Document new patch.
+
+2008-11-23 Mark Wielaard <mark at klomp.org>
+
+ * test/jtreg/com/sun/javatest/regtest/Main.java
+ (createParameters): Set same jvm safe dirs when non-null.
+ (getSameJVMSafeDirs): New method that reads samejvmsafe property
+ from TEST.ROOT.
+ (sameJVMSafeDirs): New private field.
+ * test/jtreg/com/sun/javatest/regtest/RegressionParameters.java
+ (SAME_JVM_SAFE_DIRS): New static final field.
+ (load): Read same jvm safe dirs.
+ (save0): Write same jvm safe dirs.
+ (getSameJVMSafeDirs): New method.
+ (setSameJVMSafeDirs): New method.
+ * test/jtreg/com/sun/javatest/regtest/RegressionScript.java
+ (run): Set testDirPath.
+ (isOtherJVM): Take same jvm safe into account.
+ (isSameJVMSafe): New method.
+ (testDirPath): New private field.
+
+2008-11-21 Deepak Bhole <dbhole at redhat.com>
+
+ * IcedTeaPlugin.cc: Fix a mistake in previous commit re: integer overflow.
+
+2008-11-21 Mark Wielaard <mark at klomp.org>
+
+ * patches/icedtea-stroker-finish.patch: New patch.
+ * Makefile.am (ICEDTEA_PATCHES): Add new patch.
+ * HACKING: Document new patch.
+
+2008-11-21 Deepak Bhole <dbhole at redhat.com>
+
+ * IcedTeaPlugin.cc: Handle memory address->string encoding correctly
+ depending on arch/word size.
+ * plugin/icedtea/netscape/javascript/JSObject.java: Use only long for
+ internal variable, to be on the safe side.
+ * plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java: Ditto.
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java: Rewrite
+ network->local image cache mapping code to prevent freezes on certain
+ sites. Add support for java_code, java_codebase, etc.
+ * plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java: Fix race
+ condition that froze the vm under the right circumstances.
+ * rt/net/sourceforge/jnlp/NetxPanel.java: Provide function to return the
+ applet classloader.
+
+2008-11-21 Andrew Haley <aph at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp
+ (class SharkComputableValue): Use IRBuilder<>, not IRBuilder.
+ (class SharkValue): Use IRBuilder<>, not IRBuilder.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+ (SharkFunction::CreatePopFrame): Change a few jint_types to
+ intptr_types.
+ * ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
+ (SharkConstantPool::cache_entry_at): Byte-swap the cache index.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::SharkBuilder) Inherit from template class
+ IRBuilder<>.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp:
+ (SharkBuilder::SharkBuilder) Inherit from template class
+ IRBuilder<>.
+ Change a few jint_types to intptr_types.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+ (SharkBlock::get_interface_callee): Change a few jint_types to
+ intptr_types.
+
+2008-11-18 Deepak Bhole <dbhole at redhat.com>
+ * IcedTeaPlugin.cc: Encode newline characters instead of stripping them.
+ * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Minor debug
+ output change.
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java: Fix bug in code that
+ computed width factor. Try to load images from local cache first. Decode
+ newline characters. Update parser to skip comments in applet tag.
+ * rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Take into consideration
+ system policy in addition to applet policy when determining permissions.
+ * rt/net/sourceforge/jnlp/tools/JarSigner.java: Return immediately if jar
+ could not be fetched.
+
+2008-11-17 Omair Majid <omajid at redhat.com>
+
+ * HACKING: Document icedtea-alsa-default-device.patch and
+ icedtea-linker-libs-order.patch.
2008-11-17 Matthias Klose <doko at ubuntu.com>
diff -r d8e977068163 -r 6b24535880de HACKING
--- a/HACKING Fri Nov 21 10:29:58 2008 +0000
+++ b/HACKING Tue Dec 02 13:58:24 2008 +0000
@@ -64,12 +64,18 @@ The following patches are currently appl
* icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building.
* icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
* icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
+* icedtea-stroker-finish.patch: Make sure cap calculation doesn't result in
+ divide by zero on tiny paths.
+* icedtea-alsa-default-device.patch: Fix problems with using the ALSA 'default' device.
+* icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
* icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
* icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
#6761856, swing TextLayout.getBounds() returns shifted bounds.
* icedtea-display-mode-changer.patch: Add extra test class.
* icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
+* icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
+* icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
The following patches are only applied to OpenJDK6 in IcedTea6:
@@ -104,7 +110,8 @@ The following patches are only applied t
javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
calls, replace hexadecimal floating point literals with decimal variants in
- java.lang.Double and java.lang.Float.
+ java.lang.Double and java.lang.Float.
+* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261)
The following patches are only applied for IcedTea builds using the zero-assembler:
@@ -140,6 +147,11 @@ The following patches are only applied w
* icedtea-cacao.patch: Don't run 'java' in a new thread.
+The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
+
+* icedtea-xrender-xxx.patch: Numbered patches from xrender branch
+ http://hg.openjdk.java.net/xrender/xrender/jdk
+
Obsolete Patches
================
diff -r d8e977068163 -r 6b24535880de IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Fri Nov 21 10:29:58 2008 +0000
+++ b/IcedTeaPlugin.cc Tue Dec 02 13:58:24 2008 +0000
@@ -193,6 +193,7 @@ inline suseconds_t get_time_in_ms()
return tv.tv_usec;
}
+
inline long get_time_in_s()
{
@@ -342,14 +343,11 @@ static gboolean plugin_in_pipe_callback
#include <queue>
#include <nsCOMPtr.h>
#include <nsIThread.h>
+#include <nspr.h>
PRMonitor *jvmMsgQueuePRMonitor;
std::queue<nsCString> jvmMsgQueue;
nsCOMPtr<nsIThread> processThread;
-
-#include <nspr.h>
-
-#include <prtypes.h>
// IcedTeaJNIEnv helpers.
class JNIReference
@@ -700,9 +698,10 @@ char const* TYPES[10] = { "Object",
// printf ("RECEIVE_BOOLEAN: %s result: %x = %s\n", \
// __func__, result, *result ? "true" : "false");
-#include <nscore.h>
#include <nsISupports.h>
#include <nsIFactory.h>
+#include <nscore.h>
+#include <prtypes.h>
// Factory functions.
extern "C" NS_EXPORT nsresult NSGetFactory (nsISupports* aServMgr,
@@ -901,7 +900,33 @@ ResultContainer::stop_timer()
#include <nsILiveconnect.h>
#include <nsICollection.h>
#include <nsIProcess.h>
-#include <map>
+
+#ifndef __STDC_FORMAT_MACROS
+# define __STDC_FORMAT_MACROS
+#endif
+
+#include <inttypes.h>
+
+inline void js_id_to_string(char** str, PLUGIN_JAVASCRIPT_TYPE jsid)
+{
+ if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == 4)
+ sprintf(*str, "%"PRId32, jsid);
+
+ if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == 8)
+ sprintf(*str, "%"PRId64, jsid);
+}
+
+inline PLUGIN_JAVASCRIPT_TYPE string_to_js_id(nsCString str)
+{
+ if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == sizeof(int))
+ return atoi(str.get());
+
+ if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == sizeof(long))
+ return atol(str.get());
+
+ if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == sizeof(long long))
+ return atoll(str.get());
+}
class IcedTeaJNIEnv;
@@ -988,7 +1013,7 @@ private:
PRUint32 next_instance_identifier;
PRUint32 object_identifier_return;
PRUint32 instance_count;
- int javascript_identifier;
+ PLUGIN_JAVASCRIPT_TYPE javascript_identifier;
int name_identifier;
int args_identifier;
int string_identifier;
@@ -1334,7 +1359,6 @@ private:
#include <nsPIPluginInstancePeer.h>
#include <nsIPluginInstanceOwner.h>
#include <nsIRunnable.h>
-#include <iostream>
class IcedTeaRunnable : public nsIRunnable
{
@@ -2310,10 +2334,28 @@ IcedTeaPluginInstance::Initialize (nsIPl
tagMessage += appletTag;
tagMessage += "</embed>";
- // remove newline characters from the message
- tagMessage.StripChars("\r\n");
-
- factory->SendMessageToAppletViewer (tagMessage);
+ PLUGIN_DEBUG_1ARG("TAG FROM BROWSER = %s\n", tagMessage.get());
+
+ // encode newline characters in the message
+ nsCString toSend("");
+ for (int i=0; i < tagMessage.Length(); i++)
+ {
+ if (tagMessage.get()[i] == '\r')
+ {
+ toSend += " ";
+ continue;
+ }
+
+ if (tagMessage.get()[i] == '\n')
+ {
+ toSend += " ";
+ continue;
+ }
+
+ toSend += tagMessage.get()[i];
+ }
+
+ factory->SendMessageToAppletViewer (toSend);
// Set back-pointer to peer instance.
PLUGIN_DEBUG_1ARG ("SETTING PEER!!!: %p\n", aPeer);
@@ -2894,8 +2936,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
PLUGIN_DEBUG_0ARG ("POSTING GetMember\n");
space = rest.FindChar (' ');
nsDependentCSubstring javascriptID = Substring (rest, 0, space);
- javascript_identifier = javascriptID.ToInteger (&conversionResult);
- PLUGIN_CHECK ("parse javascript id", conversionResult);
+ javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+ PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
nsDependentCSubstring nameID = Substring (rest, space + 1);
name_identifier = nameID.ToInteger (&conversionResult);
PLUGIN_CHECK ("parse name id", conversionResult);
@@ -2912,8 +2954,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
PLUGIN_DEBUG_0ARG ("POSTING SetMember\n");
space = rest.FindChar (' ');
nsDependentCSubstring javascriptID = Substring (rest, 0, space);
- javascript_identifier = javascriptID.ToInteger (&conversionResult);
- PLUGIN_CHECK ("parse javascript id", conversionResult);
+ javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+ PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
nsDependentCSubstring nameAndValue = Substring (rest, space + 1);
space = nameAndValue.FindChar (' ');
nsDependentCSubstring nameID = Substring (nameAndValue, 0, space);
@@ -2936,8 +2978,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
PLUGIN_DEBUG_0ARG ("POSTING GetSlot\n");
space = rest.FindChar (' ');
nsDependentCSubstring javascriptID = Substring (rest, 0, space);
- javascript_identifier = javascriptID.ToInteger (&conversionResult);
- PLUGIN_CHECK ("parse javascript id", conversionResult);
+ javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+ PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
nsDependentCSubstring indexStr = Substring (rest, space + 1);
slot_index = indexStr.ToInteger (&conversionResult);
PLUGIN_CHECK ("parse name id", conversionResult);
@@ -2954,8 +2996,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
PLUGIN_DEBUG_0ARG ("POSTING SetSlot\n");
space = rest.FindChar (' ');
nsDependentCSubstring javascriptID = Substring (rest, 0, space);
- javascript_identifier = javascriptID.ToInteger (&conversionResult);
- PLUGIN_CHECK ("parse javascript id", conversionResult);
+ javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+ PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
nsDependentCSubstring nameAndValue = Substring (rest, space + 1);
space = nameAndValue.FindChar (' ');
nsDependentCSubstring indexStr = Substring (nameAndValue, 0, space);
@@ -2977,8 +3019,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
PLUGIN_DEBUG_0ARG ("POSTING Eval\n");
space = rest.FindChar (' ');
nsDependentCSubstring javascriptID = Substring (rest, 0, space);
- javascript_identifier = javascriptID.ToInteger (&conversionResult);
- PLUGIN_CHECK ("parse javascript id", conversionResult);
+ javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+ PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
nsDependentCSubstring stringID = Substring (rest, space + 1);
string_identifier = stringID.ToInteger (&conversionResult);
PLUGIN_CHECK ("parse string id", conversionResult);
@@ -2995,8 +3037,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
PLUGIN_DEBUG_0ARG ("POSTING RemoveMember\n");
space = rest.FindChar (' ');
nsDependentCSubstring javascriptID = Substring (rest, 0, space);
- javascript_identifier = javascriptID.ToInteger (&conversionResult);
- PLUGIN_CHECK ("parse javascript id", conversionResult);
+ javascript_identifier = string_to_js_id ((nsCString) javascriptID);
More information about the distro-pkg-dev
mailing list