Support datalist UI for <input type=email multiple>

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"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/renderer/autofill/form_autofill_util.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
@@ skipping 33 matching lines @@
 
 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();
+  if (element.isMultiple() &&
+      element.formControlType() == WebString::fromUTF8("email")) {
+    std::vector<string16> parts;
+    base::SplitStringDontTrim(prefix, ',', &parts);
+    if (parts.size() > 0)
+      TrimWhitespace(parts[parts.size() - 1], TRIM_LEADING, &prefix);
+  }
   for (WebOptionElement option = options.firstItem().to<WebOptionElement>();
-      !option.isNull(); option = options.nextItem().to<WebOptionElement>()) {
-    if (!StartsWith(option.value(), element.value(), false) ||
+       !option.isNull(); option = options.nextItem().to<WebOptionElement>()) {
+    if (!StartsWith(option.value(), prefix, false) ||
+        option.value() == prefix ||
         !element.isValidValue(option.value()))
       continue;
 
     values->push_back(option.value());
     if (option.value() != option.label())
       labels->push_back(option.label());
     else
       labels->push_back(string16());
     icons->push_back(string16());
     item_ids->push_back(WebAutofillClient::MenuItemIDDataListEntry);
@@ skipping 128 matching lines @@
     case WebAutofillClient::MenuItemIDAutofillOptions:
       // User selected 'Autofill Options'.
       Send(new AutofillHostMsg_ShowAutofillDialog(routing_id()));
       break;
     case WebAutofillClient::MenuItemIDClearForm:
       // User selected 'Clear form'.
       form_cache_.ClearFormWithElement(element_);
       break;
     case WebAutofillClient::MenuItemIDAutocompleteEntry:
     case WebAutofillClient::MenuItemIDPasswordEntry:
+      // User selected an Autocomplete or password entry, so we fill directly.
+      SetNodeText(value, &element_);
+      break;
     case WebAutofillClient::MenuItemIDDataListEntry:
-      // User selected an Autocomplete or password or datalist entry, so we
-      // fill directly.
-      SetNodeText(value, &element_);
+      ApplyDataListSuggestionToValue(value);
       break;
     default:
       // A positive item_id is a unique id for an autofill (vs. autocomplete)
       // suggestion.
       DCHECK_GT(item_id, 0);
       // Fill the values for the whole form.
       FillAutofillFormData(node, item_id, AUTOFILL_FILL);
   }
 }
 
@@ skipping 193 matching lines @@
 
   // Send to WebKit for display.
   web_view->applyAutofillSuggestions(element, v, l, i, ids);
 
   Send(new AutofillHostMsg_DidShowAutofillSuggestions(
       routing_id(),
       has_autofill_item && !has_shown_autofill_popup_for_current_edit_));
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
 }
 
+void AutofillAgent::ApplyDataListSuggestionToValue(const string16& value) {
+  string16 new_value = value;
+  // If this element takes multiple values then replace the last part with
+  // the suggestion.
+  if (element_.isMultiple() &&
+      element_.formControlType() == WebString::fromUTF8("email")) {
+    std::vector<string16> parts;
+
+    base::SplitStringDontTrim(element_.editingValue(), ',', &parts);
+    if (parts.size() == 0)
+      parts.push_back(string16());
+
+    string16 last_part = parts.back();
+    // We want to keep just the leading whitespace.
+    for (size_t i = 0; i < last_part.size(); ++i) {
+      if (!IsWhitespace(last_part[i])) {
+        last_part = last_part.substr(0, i);
+        break;
+      }
+    }
+    last_part.append(value);
+    parts[parts.size() - 1] = last_part;
+
+    new_value = JoinString(parts, ',');
+  }
+  SetNodeText(new_value, &element_);
+}
+
 void AutofillAgent::OnFormDataFilled(int query_id,
                                      const webkit::forms::FormData& form) {
   if (!render_view()->GetWebView() || query_id != autofill_query_id_)
     return;
 
   was_query_node_autofilled_ = element_.isAutofilled();
 
   switch (autofill_action_) {
     case AUTOFILL_FILL:
       FillForm(form, element_);
@@ skipping 56 matching lines @@
 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.
-  WebString value = element.value();
+  WebString value = element.editingValue();
   if (value.length() > kMaximumTextSizeForAutofill ||
       (!autofill_on_empty_values && value.isEmpty()) ||
       (requires_caret_at_end &&
        (element.selectionStart() != element.selectionEnd() ||
         element.selectionEnd() != static_cast<int>(value.length())))) {
     // Any popup currently showing is obsolete.
     WebKit::WebView* web_view = render_view()->GetWebView();
     if (web_view)
       web_view->hidePopups();
 
@@ skipping 63 matching lines @@
   autofill_action_ = action;
   Send(new AutofillHostMsg_FillAutofillFormData(
       routing_id(), autofill_query_id_, form, field, unique_id));
 }
 
 void AutofillAgent::SetNodeText(const string16& value,
                                 WebKit::WebInputElement* node) {
   string16 substring = value;
   substring = substring.substr(0, node->maxLength());
 
-  node->setValue(substring, true);
+  WebKit::WebView* web_view = render_view()->GetWebView();
+  if (!web_view)
+    return;

[Ilya Sherman, 2012/05/16 18:05:31]

nit: I still don't see why we're checking for the WebView -- will
setEditingValue() fail if GetWebView() returns false?  If so, please add a
comment mentioning this.

[keishi, 2012/05/17 02:24:09]

Yes. Sorry I wasn't paying attention. Done.

+
+  node->setEditingValue(substring);
 }
 
 }  // namespace autofill