Changeset 18657 in webkit for trunk/JavaScriptCore/bindings/runtime.cpp

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

File:

• trunk/JavaScriptCore/bindings/runtime.cpp (modified) (2 diffs)

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);