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

chrome/renderer/autofill/autofill_agent.cc

Index: chrome/renderer/autofill/autofill_agent.cc
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index 69fd3ede8c5a02cb4a157d8105c24e55ad0d1cd8..ef755c53742c6c4a9246a1226d8b6676580422e1 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -158,8 +158,10 @@ bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
                         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;
@@ -331,8 +333,8 @@ void AutofillAgent::textFieldDidEndEditing(const WebInputElement& element) {
 
 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
@@ -589,11 +591,44 @@ void AutofillAgent::OnAcceptPasswordAutofillSuggestion(const string16& 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_,
+                                        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) {
+      WebInputElement element = elements[j].to<WebInputElement>();
+      std::string element_attr =
+          UTF16ToASCII(element.getAttribute("autocomplete"));
+      if (field_attr_lower == StringToLowerASCII(element_attr)) {
+        element.setValue(field.value, true);
+        element.setAutofilled(true);
+        break;
+      }
+    }
+  }

[Ilya Sherman, 2012/11/28 06:16:39]

Any reason not to just re-use FillForm() from form_autofill_util?

[Dan Beam, 2012/11/28 19:59:10]

That's really similar, but
a) how does this handle multiple elements with the same [autocomplete]
attribute? estade@ and I envisioned only filling the first one with the same
type.
b) it seems this won't work on non-focusable elements (i.e. [hidden] ones)?

Also, just using FillFormField() might be a middle ground.  I've added that
method to the form_autofill_util.h just for now until we decide.

[Ilya Sherman, 2012/11/29 00:08:59]

FillForm() would fill all of them.  What's the reason to only fill the first one
if the website asks for the info multiple times?
That's true, but we could add a parameter to control that.  We presumably still
don't want to fill disabled or read-only fields, though.
I think it would be best to re-use as much of the logic from the
ForEachMatchingFormField() method as possible; but if that proves to be too much
of a PITA for whatever reason, using FillFormField() is definitely better than
doing everything from scratch :)

[Dan Beam, 2012/11/29 00:51:13]

ForEachMatchingFormField also ignores select[autocomplete] at the moment -
should I remove this or is it still valid?
http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/renderer/autofill/f...

[Ilya Sherman, 2012/11/29 08:24:01]

I think you're misreading that code -- it ignores autocomplete="off" (which
might be specified on the form rather than on the field), so it simply always
treats <select> elements as potentially fillable.  It would be nice to fix that
bug, but it shouldn't affect your ability to fill the field here.  Did you test
it and find that it wasn't working?

+
+  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();
 }