diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 14:35:40 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 14:35:40 -0700 |
| commit | 5b6691d588cae4bf655a6c986f0e9dfb5a0cfd26 (patch) | |
| tree | fb83bb4b18ac52b83824d46c4db67f56debfc45a /WebCore/bridge/jni | |
| parent | 5f1ab04193ad0130ca8204aadaceae083aca9881 (diff) | |
| download | external_webkit-5b6691d588cae4bf655a6c986f0e9dfb5a0cfd26.zip external_webkit-5b6691d588cae4bf655a6c986f0e9dfb5a0cfd26.tar.gz external_webkit-5b6691d588cae4bf655a6c986f0e9dfb5a0cfd26.tar.bz2 | |
Remove a leftover.
Diffstat (limited to 'WebCore/bridge/jni')
| -rw-r--r-- | WebCore/bridge/jni/jni_utility.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/WebCore/bridge/jni/jni_utility.h b/WebCore/bridge/jni/jni_utility.h index 90e7fe5..959330d 100644 --- a/WebCore/bridge/jni/jni_utility.h +++ b/WebCore/bridge/jni/jni_utility.h @@ -285,16 +285,10 @@ T callJNIStaticMethod(jclass cls, const char* methodName, const char* methodSign return result; } -#ifdef MANUAL_MERGE_REQUIRED - #if USE(JSC) -bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JNIType returnType, jmethodID methodID, jvalue* args, jvalue& result, const char* callingURL, JSValuePtr& exceptionDescription); -#endif -#else // MANUAL_MERGE_REQUIRED - bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JNIType returnType, jmethodID methodID, jvalue* args, jvalue& result, const char* callingURL, JSValue& exceptionDescription); +#endif -#endif // MANUAL_MERGE_REQUIRED } // namespace Bindings } // namespace JSC |