Changeset 116405 in webkit

Timestamp:

May 8, 2012 2:00:08 AM (12 years ago)

Author:

abarth@webkit.org

Message:

OS(ANDROID) JNI AttachCurrentThread take JNIEnv as a parameter, not void
​https://bugs.webkit.org/show_bug.cgi?id=85869

Reviewed by Eric Seidel.

According to
​http://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/invocation.html,
AttachCurrentThread takes a JNIEnv rather than a void. Apparently,
most implementations actually take a void. The OS(ANDROID)
implementation, however, actually takes an JNIEnv. This patch
introduces a typedef to give each implementation what it desires.

• bridge/jni/JNIUtility.cpp:

(JSC::Bindings::getJNIEnv):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/jni/JNIUtility.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-08  Adam Barth  <abarth@webkit.org>
+
+        OS(ANDROID) JNI AttachCurrentThread take JNIEnv** as a parameter, not void**
+        https://bugs.webkit.org/show_bug.cgi?id=85869
+
+        Reviewed by Eric Seidel.
+
+        According to
+        http://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/invocation.html,
+        AttachCurrentThread takes a JNIEnv** rather than a void**.  Apparently,
+        most implementations actually take a void**.  The OS(ANDROID)
+        implementation, however, actually takes an JNIEnv**.  This patch
+        introduces a typedef to give each implementation what it desires.
+
+        * bridge/jni/JNIUtility.cpp:
+        (JSC::Bindings::getJNIEnv):
+
 2012-05-08  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Source/WebCore/bridge/jni/JNIUtility.cpp

@@ -83 +83 @@
 }
 
+// JDK 1.0 mistakenly declared the first parameter to AttachCurrentThread as
+// void** rather than as JNIEnv**. This quirk appears to have been carried
+// forward in implementations of Java despite what the documentation says.
+// On OS(ANDROID), however, AttachCurrentThread appears to follow the
+// documentation and expects a JNIEnv** parameter. The following typedef should
+// give each implementation what it desires.
+#if OS(ANDROID)
+typedef JNIEnv* JNIEnvDummy;
+#else
+typedef void* JNIEnvDummy;
+#endif
+
 JNIEnv* getJNIEnv()
 {
     union {
         JNIEnv* env;
-        void* dummy;
+        JNIEnvDummy dummy;
     } u;
     jint jniError = 0;