diff options
| author | Steve Block <steveblock@google.com> | 2010-05-05 10:42:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:15 +0100 |
| commit | 301bf07a335c9d471154451e7887be67e7f16082 (patch) | |
| tree | 69f5ff4280e3502b1fa4e359144a6f0c822a9a56 /WebCore/bridge | |
| parent | 239e1c2422153f064b727eb7cd970d4327bcceb5 (diff) | |
| download | external_webkit-301bf07a335c9d471154451e7887be67e7f16082.zip external_webkit-301bf07a335c9d471154451e7887be67e7f16082.tar.gz external_webkit-301bf07a335c9d471154451e7887be67e7f16082.tar.bz2 | |
Merge webkit.org at r58033 : Cherry-pick WebKit change 58775 to include jni_jsobject.h for jlong_to_pt() and ptr_to_jlong()
See http://trac.webkit.org/changeset/58775
Change-Id: Id1efa09e2f3578f8c782da0686c2df4d87fc83c3
Diffstat (limited to 'WebCore/bridge')
| -rw-r--r-- | WebCore/bridge/jni/jni_jsobject.h | 5 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp | 1 | ||||
| -rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/bridge/jni/jni_jsobject.h b/WebCore/bridge/jni/jni_jsobject.h index b4f5719..d78eb97 100644 --- a/WebCore/bridge/jni/jni_jsobject.h +++ b/WebCore/bridge/jni/jni_jsobject.h @@ -28,7 +28,6 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include <CoreFoundation/CoreFoundation.h> #include <JavaVM/jni.h> #include <runtime/JSValue.h> #include <wtf/RefPtr.h> @@ -37,6 +36,8 @@ #define jlong_to_impptr(a) (static_cast<JSC::JSObject*>(((void*)(uintptr_t)(a)))) #define ptr_to_jlong(a) ((jlong)(uintptr_t)(a)) +#if PLATFORM(MAC) + namespace JSC { class ArgList; @@ -125,6 +126,8 @@ jstring KJS_JSObject_JSObjectToString(JNIEnv*, jclass, jlong nativeJSObject); } +#endif // PLATFORM(MAC) + #endif // ENABLE(MAC_JAVA_BRIDGE) #endif // JAVASCRIPTCORE_BINDINGS_JNI_JSOBJECT_H diff --git a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp index 4702d12..b48a757 100644 --- a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp +++ b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp @@ -31,6 +31,7 @@ #include "JavaRuntimeObject.h" #include "JNIBridgeJSC.h" +#include "jni_jsobject.h" #include "runtime_array.h" #include "runtime_object.h" #include <runtime/JSArray.h> diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp index 039626f..d8de40a 100644 --- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp @@ -34,6 +34,7 @@ #include "JNIUtilityPrivate.h" #include "JavaClassJSC.h" #include "Logging.h" +#include "jni_jsobject.h" #include "runtime_method.h" #include "runtime_object.h" #include "runtime_root.h" |