Add Datalist Support to New Autofill UI

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 34 matching lines @@
 using WebKit::WebString;
 using webkit::forms::FormData;
 using webkit::forms::FormDataPredictions;
 
 namespace {
 
 // The size above which we stop triggering autofill for an input text field
 // (so to avoid sending long strings through IPC).
 const size_t kMaximumTextSizeForAutofill = 1000;
 
+// The maximum number of data list elements to send to the browser process
+// via IPC (to prevent long IPC messages).
+const size_t kMaximumDataListSizeForAutofill = 30;
+
 void AppendDataListSuggestions(const WebKit::WebInputElement& element,
                                std::vector<string16>* values,
                                std::vector<string16>* labels,
                                std::vector<string16>* icons,
                                std::vector<int>* item_ids) {
   WebNodeCollection options = element.dataListOptions();
   if (options.isNull())
     return;
 
   string16 prefix = element.editingValue();
@@ skipping 54 matching lines @@
     IPC_MESSAGE_HANDLER(AutofillMsg_SetAutofillActionFill,
                         OnSetAutofillActionFill)
     IPC_MESSAGE_HANDLER(AutofillMsg_ClearForm,
                         OnClearForm)
     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_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.
@@ skipping 383 matching lines @@
 }
 
 void AutofillAgent::OnClearPreviewedForm() {
   didClearAutofillSelection(element_);
 }
 
 void AutofillAgent::OnSetNodeText(const string16& value) {
   SetNodeText(value, &element_);
 }
 
+void AutofillAgent::OnAcceptDataListSuggestion(const string16& value) {
+  AcceptDataListSuggestion(value);
+}
+
 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);
 }
 
@@ skipping 51 matching lines @@
   webkit::forms::FormField field;
   if (!FindFormAndFieldForInputElement(element, &form, &field,
                                        REQUIRE_AUTOCOMPLETE)) {
     // If we didn't find the cached form, at least let autocomplete have a shot
     // at providing suggestions.
     WebFormControlElementToFormField(element, EXTRACT_VALUE, &field);
   }
 
   gfx::Rect bounding_box(element_.boundsInViewportSpace());
 
+  // Find the datalist values and send them to the browser process.
+  std::vector<string16> data_list_values;
+  std::vector<string16> data_list_labels;
+  std::vector<string16> data_list_icons;
+  std::vector<int> data_list_unique_ids;
+  AppendDataListSuggestions(element_,
+                            &data_list_values,
+                            &data_list_labels,
+                            &data_list_icons,
+                            &data_list_unique_ids);
+
+  if (data_list_values.size() > kMaximumDataListSizeForAutofill) {
+    data_list_values.resize(kMaximumDataListSizeForAutofill);
+    data_list_labels.resize(kMaximumDataListSizeForAutofill);
+    data_list_icons.resize(kMaximumDataListSizeForAutofill);
+    data_list_unique_ids.resize(kMaximumDataListSizeForAutofill);
+  }

[Ilya Sherman, 2012/06/07 22:56:05]

nit: You should probably also trim each entry of the vectors to be at most
kMaximumTextSizeForAutofill characters long.

[csharp, 2012/06/08 14:44:54]

Done.

+
+

[Ilya Sherman, 2012/06/07 22:56:05]

nit: Extra blank line

[csharp, 2012/06/08 14:44:54]

Done.

+  Send(new AutofillHostMsg_SetDataList(routing_id(),
+                                       data_list_values,
+                                       data_list_labels,
+                                       data_list_icons,
+                                       data_list_unique_ids));
+
   Send(new AutofillHostMsg_QueryFormFieldAutofill(routing_id(),
                                                   autofill_query_id_,
                                                   form,
                                                   field,
                                                   bounding_box,
                                                   display_warning_if_disabled));
 }
 
 void AutofillAgent::FillAutofillFormData(const WebNode& node,
                                          int unique_id,
@@ skipping 18 matching lines @@
 void AutofillAgent::SetNodeText(const string16& value,
                                 WebKit::WebInputElement* node) {
   did_set_node_text_ = true;
   string16 substring = value;
   substring = substring.substr(0, node->maxLength());
 
   node->setEditingValue(substring);
 }
 
 }  // namespace autofill