summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-06-23 20:36:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-23 20:36:24 -0700
commit20572c3409d0c4745fc376a256a720c3b9a2af98 (patch)
tree8f2ff2b08899ae8171b5c428ffe4fa66a2817658
parent1b7019689392c62db7283d1378025c2835765a85 (diff)
parentbb37fd6d72e3ef13721bfb25c5eaa50f86c5322a (diff)
downloadexternal_webkit-20572c3409d0c4745fc376a256a720c3b9a2af98.zip
external_webkit-20572c3409d0c4745fc376a256a720c3b9a2af98.tar.gz
external_webkit-20572c3409d0c4745fc376a256a720c3b9a2af98.tar.bz2
Merge "Check "email" input as some sites use it as the username."
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index e375e46..87ee07b 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1491,7 +1491,7 @@ static jobjectArray GetUsernamePassword(JNIEnv *env, jobject obj)
continue;
if (input->inputType() == WebCore::HTMLInputElement::PASSWORD)
password = input->value();
- else if (input->inputType() == WebCore::HTMLInputElement::TEXT)
+ else if (input->inputType() == WebCore::HTMLInputElement::TEXT || input->inputType() == WebCore::HTMLInputElement::EMAIL)
username = input->value();
if (!username.isNull() && !password.isNull())
found = true;
@@ -1537,7 +1537,7 @@ static void SetUsernamePassword(JNIEnv *env, jobject obj,
continue;
if (input->inputType() == WebCore::HTMLInputElement::PASSWORD)
passwordEle = input;
- else if (input->inputType() == WebCore::HTMLInputElement::TEXT)
+ else if (input->inputType() == WebCore::HTMLInputElement::TEXT || input->inputType() == WebCore::HTMLInputElement::EMAIL)
usernameEle = input;
if (usernameEle != NULL && passwordEle != NULL)
found = true;