Changeset 18657 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 7, 2007, 9:11:18 PM (18 years ago)

Author:

ddkilzer

Message:

JavaScriptCore:

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12100 JNI bindings should be available to non-Mac platforms that have JNI

Change JNI so that it is not wrapped in the PLATFORM(MAC) ifdef, enabling
other platforms who have JNI to use it.

• bindings/jni/jni_instance.h: Removed unnecessary include of <CoreFoundation/CoreFoundation.h>
• bindings/jni/jni_utility.cpp: (KJS::Bindings::setJavaVM):
• bindings/jni/jni_utility.h: Added new method for clients to set the JavaVM
• bindings/runtime.cpp: (KJS::Bindings::Instance::createBindingForLanguageInstance): Changed code to utilize new #if HAVE(JNI)
• kjs/config.h: Added new #define for JNI, ie HAVE_JNI

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/jni/jni_instance.h (modified) (1 diff)
• bindings/jni/jni_utility.cpp (modified) (1 diff)
• bindings/jni/jni_utility.h (modified) (1 diff)
• bindings/runtime.cpp (modified) (2 diffs)
• kjs/config.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-07  David Carson  <[email protected]>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12100
+          JNI bindings should be available to non-Mac platforms that have JNI
+
+        Change JNI so that it is not wrapped in the PLATFORM(MAC) ifdef, enabling
+        other platforms who have JNI to use it.
+
+        * bindings/jni/jni_instance.h:  
+          Removed unnecessary include of <CoreFoundation/CoreFoundation.h>
+        * bindings/jni/jni_utility.cpp:
+        (KJS::Bindings::setJavaVM):
+        * bindings/jni/jni_utility.h:
+          Added new method for clients to set the JavaVM
+        * bindings/runtime.cpp:
+        (KJS::Bindings::Instance::createBindingForLanguageInstance):
+          Changed code to utilize new #if HAVE(JNI)
+        * kjs/config.h:
+          Added new #define for JNI, ie HAVE_JNI
+
 2007-01-07  David Carson  <[email protected]>
 

trunk/JavaScriptCore/bindings/jni/jni_instance.h

@@ -30 +30 @@
 #include "runtime.h"
 
-#include <CoreFoundation/CoreFoundation.h>
 #include <JavaVM/jni.h>
 

trunk/JavaScriptCore/bindings/jni/jni_utility.cpp

@@ -56 +56 @@
 static JavaVM *jvm = 0;
 
+// Provide the ability for an outside component to specify the JavaVM to use
+// If the jvm value is set, the getJavaVM function below will just return. 
+// In getJNIEnv(), if AttachCurrentThread is called to a VM that is already
+// attached, the result is a no-op.
+void setJavaVM(JavaVM *javaVM)
+{
+    jvm = javaVM;
+}
+
 JavaVM *getJavaVM()
 {

trunk/JavaScriptCore/bindings/jni/jni_utility.h

@@ -103 +103 @@
 
 JavaVM *getJavaVM();
+void    setJavaVM(JavaVM *javaVM);
 JNIEnv *getJNIEnv();
 

trunk/JavaScriptCore/bindings/runtime.cpp

@@ -30 +30 @@
 #include "NP_jsobject.h"
 #include "c_instance.h"
+#if HAVE(JNI)
+#include "jni_instance.h"
+#endif
 #if PLATFORM(MAC)
-#include "jni_instance.h"
 #include "objc_instance.h"
 #endif
@@ -118 +120 @@
     
     switch (language) {
-#if PLATFORM(MAC)
+#if HAVE(JNI)
         case Instance::JavaLanguage: {
             newInstance = new Bindings::JavaInstance((jobject)nativeInstance, rootObject);
             break;
         }
+#endif
+#if PLATFORM(MAC)
         case Instance::ObjectiveCLanguage: {
             newInstance = new Bindings::ObjcInstance((ObjectStructPtr)nativeInstance);

trunk/JavaScriptCore/kjs/config.h

@@ -33 +33 @@
 #define HAVE_SYS_TIME_H 1
 #define HAVE_SYS_TIMEB_H 1
+#define HAVE_JNI 1
 
 #elif PLATFORM(WIN_OS)