diff options
| author | Steve Block <steveblock@google.com> | 2010-09-22 11:40:10 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:45:49 +0100 |
| commit | 2b9fea6f8b26a3ee80e2c4ae416c034d3466e422 (patch) | |
| tree | 08fa24288a3525356ec496ac5cec55cb42277e08 /WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | 05f2a24e0649f87dfe4a0c2029eb9ea3baf2323f (diff) | |
| download | external_webkit-2b9fea6f8b26a3ee80e2c4ae416c034d3466e422.zip external_webkit-2b9fea6f8b26a3ee80e2c4ae416c034d3466e422.tar.gz external_webkit-2b9fea6f8b26a3ee80e2c4ae416c034d3466e422.tar.bz2 | |
Merge WebKit at r67908: HTMLInputElement::InputType renamed
InputType renamed to DeprecatedInputType
See http://trac.webkit.org/changeset/67903
Change-Id: I9efb9889588523dd2b9489809fb2c44bd799d2ba
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index d6dd4bc..8a55e15 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1619,8 +1619,7 @@ static jboolean HasPasswordField(JNIEnv *env, jobject obj) for (size_t i = 0; i< size && !found; i++) { WebCore::HTMLFormControlElement* e = elements[i]; if (e->hasLocalName(WebCore::HTMLNames::inputTag)) { - if (((WebCore::HTMLInputElement*)e)->inputType() == - WebCore::HTMLInputElement::PASSWORD) + if (static_cast<WebCore::HTMLInputElement*>(e)->isPasswordField()) found = true; } } @@ -1653,9 +1652,9 @@ static jobjectArray GetUsernamePassword(JNIEnv *env, jobject obj) WebCore::HTMLInputElement* input = (WebCore::HTMLInputElement*)e; if (input->autoComplete() == false) continue; - if (input->inputType() == WebCore::HTMLInputElement::PASSWORD) + if (input->isPasswordField()) password = input->value(); - else if (input->inputType() == WebCore::HTMLInputElement::TEXT || input->inputType() == WebCore::HTMLInputElement::EMAIL) + else if (input->isTextField() || input->isEmailField()) username = input->value(); if (!username.isNull() && !password.isNull()) found = true; @@ -1699,9 +1698,9 @@ static void SetUsernamePassword(JNIEnv *env, jobject obj, WebCore::HTMLInputElement* input = (WebCore::HTMLInputElement*)e; if (input->autoComplete() == false) continue; - if (input->inputType() == WebCore::HTMLInputElement::PASSWORD) + if (input->isPasswordField()) passwordEle = input; - else if (input->inputType() == WebCore::HTMLInputElement::TEXT || input->inputType() == WebCore::HTMLInputElement::EMAIL) + else if (input->isTextField() || input->isEmailField()) usernameEle = input; if (usernameEle != NULL && passwordEle != NULL) found = true; |