1 files changed, 1 insertions, 35 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 1267647..e379a63 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -111,7 +111,6 @@ struct JavaGlue {
     jmethodID   m_getScaledMaxYScroll;
     jmethodID   m_getVisibleRect;
     jmethodID   m_rebuildWebTextView;
-    jmethodID   m_displaySoftKeyboard;
     jmethodID   m_viewInvalidate;
     jmethodID   m_viewInvalidateRect;
     jmethodID   m_postInvalidateDelayed;
@@ -141,7 +140,6 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl)
     m_javaGlue.m_getScaledMaxYScroll = GetJMethod(env, clazz, "getScaledMaxYScroll", "()I");
     m_javaGlue.m_getVisibleRect = GetJMethod(env, clazz, "sendOurVisibleRect", "()Landroid/graphics/Rect;");
     m_javaGlue.m_rebuildWebTextView = GetJMethod(env, clazz, "rebuildWebTextView", "()V");
-    m_javaGlue.m_displaySoftKeyboard = GetJMethod(env, clazz, "displaySoftKeyboard", "(Z)V");
     m_javaGlue.m_viewInvalidate = GetJMethod(env, clazz, "viewInvalidate", "()V");
     m_javaGlue.m_viewInvalidateRect = GetJMethod(env, clazz, "viewInvalidate", "(IIII)V");
     m_javaGlue.m_postInvalidateDelayed = GetJMethod(env, clazz,
@@ -980,12 +978,7 @@ bool motionUp(int x, int y, int slop)
             (WebCore::Node*) result->nodePointer(), rx, ry);
     }
     viewInvalidate();
-    if (result->isTextInput()) {
-        bool isReadOnly = frame->textInput(result)->isReadOnly();
-        rebuildWebTextView();
-        if (!isReadOnly)
-            displaySoftKeyboard(true);
-    } else {
+    if (!result->isTextInput()) {
         clearTextEntry();
         setFollowedLink(true);
         if (syntheticLink)
@@ -1307,19 +1300,6 @@ void rebuildWebTextView()
     checkException(env);
 }
 
-void displaySoftKeyboard(bool isTextView)
-{
-    JNIEnv* env = JSC::Bindings::getJNIEnv();
-    AutoJObject obj = m_javaGlue.object(env);
-    // if it is called during or after DESTROY is handled, the real object of
-    // WebView can be gone. Check before using it.
-    if (!obj.get())
-        return;
-    env->CallVoidMethod(obj.get(),
-            m_javaGlue.m_displaySoftKeyboard, isTextView);
-    checkException(env);
-}
-
 void viewInvalidate()
 {
     JNIEnv* env = JSC::Bindings::getJNIEnv();
@@ -1554,18 +1534,6 @@ static bool nativeCursorIsAnchor(JNIEnv *env, jobject obj)
     return node ? node->isAnchor() : false;
 }
 
-static bool nativeCursorIsReadOnly(JNIEnv *env, jobject obj)
-{
-    const CachedFrame* frame;
-    const CachedNode* node = getCursorNode(env, obj, &frame);
-    if (!node)
-        return false;
-    const CachedInput* input = frame->textInput(node);
-    if (!input)
-        return false;
-    return input->isReadOnly();
-}
-
 static bool nativeCursorIsTextInput(JNIEnv *env, jobject obj)
 {
     const CachedNode* node = getCursorNode(env, obj);
@@ -2205,8 +2173,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeCursorIntersects },
     { "nativeCursorIsAnchor", "()Z",
         (void*) nativeCursorIsAnchor },
-    { "nativeCursorIsReadOnly", "()Z",
-        (void*) nativeCursorIsReadOnly },
     { "nativeCursorIsTextInput", "()Z",
         (void*) nativeCursorIsTextInput },
     { "nativeCursorPosition", "()Landroid/graphics/Point;",