Password Autofill disables auto-completed textfield

chrome/renderer/password_autocomplete_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/password_autocomplete_manager.h"
 
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
@@ skipping 223 matching lines @@
 
   // If wait_for_username is false, we should have filled when the text changed.
   if (!fill_data.wait_for_username)
     return false;
 
   WebKit::WebInputElement password = iter->second.password_field;
   if (!IsElementEditable(password))
     return false;
 
   WebKit::WebInputElement username = element;  // We need a non-const.
-  FillUserNameAndPassword(&username, &password, fill_data, true);
+
+  // Do not set selection when ending an editing session, otherwise it can
+  // mess with focus.
+  FillUserNameAndPassword(&username, &password, fill_data, true, false);
   return true;
 }
 
 bool PasswordAutocompleteManager::TextDidChangeInTextField(
     const WebKit::WebInputElement& element) {
   LoginToPasswordInfoMap::const_iterator iter =
       login_to_password_info_.find(element);
   if (iter == login_to_password_info_.end())
     return false;
 
@@ skipping 55 matching lines @@
     const WebKit::WebInputElement& user_input) {
   LoginToPasswordInfoMap::iterator iter =
       login_to_password_info_.find(user_input);
   if (iter == login_to_password_info_.end())
     return false;
   const webkit_glue::PasswordFormFillData& fill_data =
       iter->second.fill_data;
   WebKit::WebInputElement password = iter->second.password_field;
   WebKit::WebInputElement non_const_user_input(user_input);
   return FillUserNameAndPassword(&non_const_user_input, &password,
-                                 fill_data, true);
+                                 fill_data, true, true);
 }
 
 void PasswordAutocompleteManager::PerformInlineAutocomplete(
     const WebKit::WebInputElement& username_input,
     const WebKit::WebInputElement& password_input,
     const webkit_glue::PasswordFormFillData& fill_data) {
   DCHECK(!fill_data.wait_for_username);
 
   // We need non-const versions of the username and password inputs.
   WebKit::WebInputElement username = username_input;
   WebKit::WebInputElement password = password_input;
 
   // Don't inline autocomplete if the caret is not at the end.
   // TODO(jcivelli): is there a better way to test the caret location?
   if (username.selectionStart() != username.selectionEnd() ||
       username.selectionEnd() != static_cast<int>(username.value().length())) {
     return;
   }
 
   // Show the popup with the list of available usernames.
   ShowSuggestionPopup(fill_data, username);
 
   // Fill the user and password field with the most relevant match.
-  FillUserNameAndPassword(&username, &password, fill_data, false);
+  FillUserNameAndPassword(&username, &password, fill_data, false, true);
 }
 
 void PasswordAutocompleteManager::SendPasswordForms(WebKit::WebFrame* frame,
                                                     bool only_visible) {
   // Make sure that this security origin is allowed to use password manager.
   WebKit::WebSecurityOrigin security_origin = frame->securityOrigin();
   if (!security_origin.canAccessPasswordManager())
     return;
 
   WebKit::WebVector<WebKit::WebFormElement> forms;
@@ skipping 74 matching lines @@
   std::vector<int> ids(suggestions.size(), 0);
   webview->applyAutoFillSuggestions(user_input, suggestions, labels, icons, ids,
                                     -1);
   return true;
 }
 
 bool PasswordAutocompleteManager::FillUserNameAndPassword(
     WebKit::WebInputElement* username_element,
     WebKit::WebInputElement* password_element,
     const webkit_glue::PasswordFormFillData& fill_data,
-    bool exact_username_match) {
+    bool exact_username_match,
+    bool set_selection) {
   string16 current_username = username_element->value();
   // username and password will contain the match found if any.
   string16 username;
   string16 password;
 
   // Look for any suitable matches to current field text.
   if (DoUsernamesMatch(fill_data.basic_data.fields[0].value(), current_username,
                        exact_username_match)) {
     username = fill_data.basic_data.fields[0].value();
     password = fill_data.basic_data.fields[1].value();
   } else {
     // Scan additional logins for a match.
     webkit_glue::PasswordFormFillData::LoginCollection::const_iterator iter;
     for (iter = fill_data.additional_logins.begin();
          iter != fill_data.additional_logins.end(); ++iter) {
       if (DoUsernamesMatch(iter->first, current_username,
                            exact_username_match)) {
         username = iter->first;
         password = iter->second;
         break;
       }
     }
   }
   if (password.empty())
     return false;  // No match was found.
 
   // Input matches the username, fill in required values.
   username_element->setValue(username);
-  username_element->setSelectionRange(current_username.length(),
-                                      username.length());
+
+  if (set_selection) {
+    username_element->setSelectionRange(current_username.length(),
+                                        username.length());
+  }
+
   SetElementAutofilled(username_element, true);
   if (IsElementEditable(*password_element))
     password_element->setValue(password);
   SetElementAutofilled(password_element, true);
   return true;
 }
 
 int PasswordAutocompleteManager::GetRoutingID() const {
   return render_view_->routing_id();
 }