1 files changed, 2 insertions, 3 deletions
diff --git a/WebKit/chromium/src/WebPasswordFormUtils.cpp b/WebKit/chromium/src/WebPasswordFormUtils.cpp
index 6968e1a..b4997e5 100644
--- a/WebKit/chromium/src/WebPasswordFormUtils.cpp
+++ b/WebKit/chromium/src/WebPasswordFormUtils.cpp
@@ -98,9 +98,8 @@ void findPasswordFormFields(HTMLFormElement* form, PasswordFormFields* fields)
             if (!inputElement->isEnabledFormControl())
                 continue;
 
-            // FIXME: This needs to use a function other than deprecatedInputType.
-            // Does this really want to special-case TEXT, and not other text-field-like input elements?
-            if ((inputElement->deprecatedInputType() == HTMLInputElement::TEXT)
+            // Various input types such as text, url, email can be a username field.
+            if ((inputElement->isTextField() && !inputElement->isPasswordField())
                 && (inputElement->autoComplete())) {
                 fields->userName = inputElement;
                 break;