summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-01-07 10:32:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-07 10:32:55 -0800
commit012b75708aa7a7d3a3dd6a02b514e080317ccd39 (patch)
treeb9871c53da5d969ee6111fc467b0d4aaad028491
parent5a329f87f373bc9ddfbd6139d7e5bc467f876ad5 (diff)
parent6864ec3c0bb8b5cc0dfa126546419113e946661a (diff)
downloadexternal_webkit-012b75708aa7a7d3a3dd6a02b514e080317ccd39.zip
external_webkit-012b75708aa7a7d3a3dd6a02b514e080317ccd39.tar.gz
external_webkit-012b75708aa7a7d3a3dd6a02b514e080317ccd39.tar.bz2
am 6864ec3c: am 1ccac4c1: remove unused jni interfaces
Merge commit '6864ec3c0bb8b5cc0dfa126546419113e946661a' * commit '6864ec3c0bb8b5cc0dfa126546419113e946661a': remove unused jni interfaces
-rw-r--r--WebKit/android/nav/WebView.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 6ba37ba..6a0eb00 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -1794,12 +1794,6 @@ static int nativeFocusCandidateType(JNIEnv *env, jobject obj)
}
}
-static bool nativeFocusCandidateIsPlugin(JNIEnv *env, jobject obj)
-{
- const CachedNode* node = getFocusCandidate(env, obj);
- return node ? node->isPlugin() : false;
-}
-
static bool nativeFocusIsPlugin(JNIEnv *env, jobject obj)
{
const CachedNode* node = getFocusNode(env, obj);
@@ -2187,8 +2181,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
(void*) nativeFocusCandidateFramePointer },
{ "nativeFocusCandidateIsPassword", "()Z",
(void*) nativeFocusCandidateIsPassword },
- { "nativeFocusCandidateIsPlugin", "()Z",
- (void*) nativeFocusCandidateIsPlugin },
{ "nativeFocusCandidateIsRtlText", "()Z",
(void*) nativeFocusCandidateIsRtlText },
{ "nativeFocusCandidateIsTextInput", "()Z",