Remove nativeCursorMatchesFocus method.

Bug:3335014
Change-Id: I55e60cec72f27ab2877455a7899a21cbd86a0efa

1 files changed, 4 insertions, 13 deletions

diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index be276a7..8252bb8 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -840,9 +840,9 @@ bool moveCursor(int keyCode, int count, bool ignoreScroll)
         m_viewImpl->updateCursorBounds(root, cachedFrame, cachedNode);
         root->setCursor(const_cast<CachedFrame*>(cachedFrame),
                 const_cast<CachedNode*>(cachedNode));
-        bool disableFocusController = cachedNode != root->currentFocus()
+        bool clearTextEntry = cachedNode != root->currentFocus()
                 && cachedNode->wantsKeyEvents();
-        sendMoveMouseIfLatest(disableFocusController);
+        sendMoveMouseIfLatest(clearTextEntry);
         sendMoveSelection((WebCore::Frame*) cachedFrame->framePointer(),
                 (WebCore::Node*) cachedNode->nodePointer());
     } else {
@@ -1191,12 +1191,12 @@ void sendMoveMouse(WebCore::Frame* framePtr, WebCore::Node* nodePtr, int x, int
     checkException(env);
 }
 
-void sendMoveMouseIfLatest(bool disableFocusController)
+void sendMoveMouseIfLatest(bool clearTextEntry)
 {
     LOG_ASSERT(m_javaGlue.m_obj, "A java object was not associated with this native WebView!");
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     env->CallVoidMethod(m_javaGlue.object(env).get(),
-            m_javaGlue.m_sendMoveMouseIfLatest, disableFocusController);
+            m_javaGlue.m_sendMoveMouseIfLatest, clearTextEntry);
     checkException(env);
 }
 
@@ -1564,13 +1564,6 @@ static jboolean nativePageShouldHandleShiftAndArrows(JNIEnv *env, jobject obj)
             && cursor->isContentEditable();
 }
 
-static jboolean nativeCursorMatchesFocus(JNIEnv *env, jobject obj)
-{
-    const CachedNode* cursor = getCursorNode(env, obj);
-    const CachedNode* focus = getFocusNode(env, obj);
-    return cursor && focus && cursor->nodePointer() == focus->nodePointer();
-}
-
 static jobject nativeCursorNodeBounds(JNIEnv *env, jobject obj)
 {
     const CachedFrame* frame;
@@ -2315,8 +2308,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeCursorFramePointer },
     { "nativePageShouldHandleShiftAndArrows", "()Z",
         (void*) nativePageShouldHandleShiftAndArrows },
-    { "nativeCursorMatchesFocus", "()Z",
-        (void*) nativeCursorMatchesFocus },
     { "nativeCursorNodeBounds", "()Landroid/graphics/Rect;",
         (void*) nativeCursorNodeBounds },
     { "nativeCursorNodePointer", "()I",