[autofill] Fill in values on a successful run of interactive autocomplete.

chrome/renderer/autofill/autofill_agent.cc

 // Copyright (c) 2012 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/autofill/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/string_split.h"
@@ skipping 140 matching lines @@
     IPC_MESSAGE_HANDLER(AutofillMsg_SetAutofillActionPreview,
                         OnSetAutofillActionPreview)
     IPC_MESSAGE_HANDLER(AutofillMsg_ClearPreviewedForm,
                         OnClearPreviewedForm)
     IPC_MESSAGE_HANDLER(AutofillMsg_SetNodeText,
                         OnSetNodeText)
     IPC_MESSAGE_HANDLER(AutofillMsg_AcceptDataListSuggestion,
                         OnAcceptDataListSuggestion)
     IPC_MESSAGE_HANDLER(AutofillMsg_AcceptPasswordAutofillSuggestion,
                         OnAcceptPasswordAutofillSuggestion)
-    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteFinished,
-                        OnRequestAutocompleteFinished)
+    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteSuccess,
+                        OnRequestAutocompleteSuccess)
+    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteError,
+                        OnRequestAutocompleteError)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void AutofillAgent::DidFinishDocumentLoad(WebFrame* frame) {
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
   std::vector<FormData> forms;
   form_cache_.ExtractForms(*frame, &forms);
@@ skipping 151 matching lines @@
 }
 
 void AutofillAgent::textFieldDidEndEditing(const WebInputElement& element) {
   password_autofill_manager_->TextFieldDidEndEditing(element);
   has_shown_autofill_popup_for_current_edit_ = false;
   Send(new AutofillHostMsg_DidEndTextFieldEditing(routing_id()));
 }
 
 void AutofillAgent::textFieldDidChange(const WebInputElement& element) {
   if (did_set_node_text_) {
-      did_set_node_text_ = false;
-      return;
+    did_set_node_text_ = false;
+    return;
   }
 
   // We post a task for doing the Autofill as the caret position is not set
   // properly at this point (http://bugs.webkit.org/show_bug.cgi?id=16976) and
   // it is needed to trigger autofill.
   weak_ptr_factory_.InvalidateWeakPtrs();
   MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&AutofillAgent::TextFieldDidChangeImpl,
                    weak_ptr_factory_.GetWeakPtr(), element));
@@ skipping 236 matching lines @@
 void AutofillAgent::OnAcceptPasswordAutofillSuggestion(const string16& value) {
   // We need to make sure this is handled here because the browser process
   // skipped it handling because it believed it would be handled here. If it
   // isn't handled here then the browser logic needs to be updated.
   bool handled = password_autofill_manager_->DidAcceptAutofillSuggestion(
       element_,
       value);
   DCHECK(handled);
 }
 
-void AutofillAgent::OnRequestAutocompleteFinished(
-    WebFormElement::AutocompleteResult result) {
+void AutofillAgent::OnRequestAutocompleteSuccess(const FormData& form_data) {
   DCHECK(!in_flight_request_form_.isNull());
 
-  in_flight_request_form_.finishRequestAutocomplete(result);
+  std::vector<WebKit::WebFormControlElement> elements;
+  autofill::ExtractAutofillableElements(in_flight_request_form_,

[Dan Beam, 2012/11/29 01:05:48]

oh, I guess I'm using this as well... (drops select tags)

+                                        REQUIRE_AUTOCOMPLETE,
+                                        &elements);
+
+  for (size_t i = 0; i < form_data.fields.size(); ++i) {
+    const FormFieldData field = form_data.fields[i];
+
+    // TODO(dbeam): change to DCHECK() if values must be non-empty to confirm.
+    if (field.value.empty())
+      continue;
+
+    const std::string field_attr_lower =
+        StringToLowerASCII(field.autocomplete_attribute);
+    for (size_t j = 0; j < elements.size(); ++j) {
+      const std::string element_attr =
+          UTF16ToASCII(elements[j].getAttribute("autocomplete"));

[Evan Stade, 2012/11/29 01:06:28]

if the attribute can have non-ASCII characters, this will dcheck.

[Dan Beam, 2012/11/29 02:14:59]

Fixed.

+      if (field_attr_lower == StringToLowerASCII(element_attr)) {
+        autofill::FillFormField(&elements[j], &field, false);
+        break;
+      }
+    }
+  }
+
+  in_flight_request_form_.finishRequestAutocomplete(
+      WebFormElement::AutocompleteResultSuccess);
   in_flight_request_form_.reset();
 }
 
+void AutofillAgent::OnRequestAutocompleteError() {
+  DCHECK(!in_flight_request_form_.isNull());
+  in_flight_request_form_.finishRequestAutocomplete(
+      WebFormElement::AutocompleteResultError);
+  in_flight_request_form_.reset();
+}
+
 void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
                                     bool display_warning_if_disabled) {
   if (!element.isEnabled() || element.isReadOnly() || !element.isTextField() ||
       element.isPasswordField() || !element.suggestedValue().isEmpty())
     return;
 
   // Don't attempt to autofill with values that are too large or if filling
   // criteria are not met.
@@ skipping 123 matching lines @@
     web_view->hidePopups();
 
   HideHostPopups();
 }
 
 void AutofillAgent::HideHostPopups() {
   Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
 }
 
 }  // namespace autofill