Remove updateTextfield for changing passwords.

 The UI no longer needs to know about password field changes as
 it is not required like it was with the removed WebTextView.

Change-Id: I16a6bb44c31c83c5c3e9cb70f2bc865d5eb2732c

3 files changed, 8 insertions, 19 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 56e7e24..864b27d 100644
--- a/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -164,10 +164,10 @@ void PlatformBridge::updateViewport(FrameView* frameView)
     webViewCore->updateViewport();
 }
 
-void PlatformBridge::updateTextfield(FrameView* frameView, Node* nodePtr, bool changeToPassword, const WTF::String& text)
+void PlatformBridge::updateTextfield(FrameView* frameView, Node* nodePtr, const WTF::String& text)
 {
     android::WebViewCore* webViewCore = android::WebViewCore::getWebViewCore(frameView);
-    webViewCore->updateTextfield(nodePtr, changeToPassword, text);
+    webViewCore->updateTextfield(nodePtr, text);
 }
 
 void PlatformBridge::setScrollPosition(ScrollView* scrollView, int x, int y) {
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index b0317c06..954a361 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -470,7 +470,7 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     m_javaGlue->m_updateViewport = GetJMethod(env, clazz, "updateViewport", "()V");
     m_javaGlue->m_sendNotifyProgressFinished = GetJMethod(env, clazz, "sendNotifyProgressFinished", "()V");
     m_javaGlue->m_sendViewInvalidate = GetJMethod(env, clazz, "sendViewInvalidate", "(IIII)V");
-    m_javaGlue->m_updateTextfield = GetJMethod(env, clazz, "updateTextfield", "(IZLjava/lang/String;I)V");
+    m_javaGlue->m_updateTextfield = GetJMethod(env, clazz, "updateTextfield", "(ILjava/lang/String;I)V");
     m_javaGlue->m_updateTextSelection = GetJMethod(env, clazz, "updateTextSelection", "(IIIII)V");
     m_javaGlue->m_updateTextSizeAndScroll = GetJMethod(env, clazz, "updateTextSizeAndScroll", "(IIIII)V");
     m_javaGlue->m_clearTextEntry = GetJMethod(env, clazz, "clearTextEntry", "()V");
@@ -2991,7 +2991,7 @@ void WebViewCore::passToJs(int generation, const WTF::String& current,
     WTF::String test = getInputText(focus);
     if (test != current) {
         // If the text changed during the key event, update the UI text field.
-        updateTextfield(focus, false, test);
+        updateTextfield(focus, test);
     }
     // Now that the selection has settled down, send it.
     updateTextSelection();
@@ -3894,8 +3894,7 @@ void WebViewCore::updateTextSizeAndScroll(WebCore::Node* node)
     checkException(env);
 }
 
-void WebViewCore::updateTextfield(WebCore::Node* ptr, bool changeToPassword,
-        const WTF::String& text)
+void WebViewCore::updateTextfield(WebCore::Node* ptr, const WTF::String& text)
 {
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     AutoJObject javaObject = m_javaGlue->object(env);
@@ -3903,15 +3902,9 @@ void WebViewCore::updateTextfield(WebCore::Node* ptr, bool changeToPassword,
         return;
     if (m_blockTextfieldUpdates)
         return;
-    if (changeToPassword) {
-        env->CallVoidMethod(javaObject.get(), m_javaGlue->m_updateTextfield,
-                (int) ptr, true, 0, m_textGeneration);
-        checkException(env);
-        return;
-    }
     jstring string = wtfStringToJstring(env, text);
     env->CallVoidMethod(javaObject.get(), m_javaGlue->m_updateTextfield,
-            (int) ptr, false, string, m_textGeneration);
+            (int) ptr, string, m_textGeneration);
     env->DeleteLocalRef(string);
     checkException(env);
 }
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index def09d7..9d07e5f 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -202,13 +202,9 @@ namespace android {
         /**
          * Tell the java side to update the focused textfield
          * @param pointer   Pointer to the node for the input field.
-         * @param   changeToPassword  If true, we are changing the textfield to
-         *          a password field, and ignore the WTF::String
-         * @param text  If changeToPassword is false, this is the new text that
-         *              should go into the textfield.
+         * @param text  This is the new text that should go into the textfield.
          */
-        void updateTextfield(WebCore::Node* pointer,
-                bool changeToPassword, const WTF::String& text);
+        void updateTextfield(WebCore::Node* pointer, const WTF::String& text);
 
         /**
          * Tell the java side to update the current selection in the focused