Add Autofill preview support for <select> input fields

components/autofill/content/renderer/form_autofill_util.cc

 // Copyright 2013 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 "components/autofill/content/renderer/form_autofill_util.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 552 matching lines @@
 
 // Sets the |field|'s "suggested" (non JS visible) value to the value in |data|.
 // Also sets the "autofilled" attribute, causing the background to be yellow.
 void PreviewFormField(const FormFieldData& data,
                       bool is_initiating_node,
                       blink::WebFormControlElement* field) {
   // Nothing to preview.
   if (data.value.empty())
     return;
 
-  // Preview input and textarea fields. For input fields, excludes checkboxes
-  // and radio buttons, as there is no provision for setSuggestedCheckedValue
-  // in WebInputElement.
+  // Preview input, textarea and select fields. For input fields, excludes
+  // checkboxes and radio buttons, as there is no provision for
+  // setSuggestedCheckedValue in WebInputElement.
   WebInputElement* input_element = toWebInputElement(field);
   if (IsTextInput(input_element)) {
     // If the maxlength attribute contains a negative value, maxLength()
     // returns the default maxlength value.
     input_element->setSuggestedValue(
       data.value.substr(0, input_element->maxLength()));
     input_element->setAutofilled(true);
     if (is_initiating_node) {
       // Select the part of the text that the user didn't type.
       input_element->setSelectionRange(
           input_element->value().length(),
           input_element->suggestedValue().length());
     }
   } else if (IsTextAreaElement(*field)) {
     WebTextAreaElement textarea = field->to<WebTextAreaElement>();
     textarea.setSuggestedValue(data.value);
     field->setAutofilled(true);
+  } else if (IsSelectElement(*field)) {
+    WebSelectElement select_element = field->to<WebSelectElement>();
+    // Check the original selected option value
+    select_element.setOriginalValue(select_element.value());

[Ilya Sherman, 2014/02/08 01:40:41]

This should not be necessary; the select element should keep track of this state
internally.

+    select_element.setSuggestedValue(data.value);
+    field->setAutofilled(true);
   }
 }
 
 std::string RetrievalMethodToString(
     const WebElementDescriptor::RetrievalMethod& method) {
   switch (method) {
     case WebElementDescriptor::CSS_SELECTOR:
       return "CSS_SELECTOR";
     case WebElementDescriptor::ID:
       return "ID";
@@ skipping 448 matching lines @@
   std::vector<WebFormControlElement> control_elements;
   ExtractAutofillableElements(form_element, REQUIRE_AUTOCOMPLETE,
                               &control_elements);
   for (size_t i = 0; i < control_elements.size(); ++i) {
     // There might be unrelated elements in this form which have already been
     // auto-filled.  For example, the user might have already filled the address
     // part of a form and now be dealing with the credit card section.  We only
     // want to reset the auto-filled status for fields that were previewed.
     WebFormControlElement control_element = control_elements[i];
 
-    // Only text input and textarea elements can be previewed.
+    // Only text input, textarea and Select elements can be previewed.

[Ilya Sherman, 2014/02/08 01:40:41]

nit: "Select" -> "select"

     WebInputElement* input_element = toWebInputElement(&control_element);
-    if (!IsTextInput(input_element) && !IsTextAreaElement(control_element))
+    if (!IsTextInput(input_element) &&
+        !IsTextAreaElement(control_element) &&
+        !IsSelectElement(control_element))
       continue;
 
     // If the element is not auto-filled, we did not preview it,
     // so there is nothing to reset.
     if(!control_element.isAutofilled())
       continue;
 
     if ((IsTextInput(input_element) &&
          input_element->suggestedValue().isEmpty()) ||
         (IsTextAreaElement(control_element) &&
-         control_element.to<WebTextAreaElement>().suggestedValue().isEmpty()))
+         control_element.to<WebTextAreaElement>().suggestedValue().isEmpty()) ||
+        (IsSelectElement(control_element) &&
+         control_element.to<WebSelectElement>().suggestedValue().isEmpty()))
       continue;
 
     // Clear the suggested value. For the initiating node, also restore the
     // original value.
     if (IsTextInput(input_element)) {
       input_element->setSuggestedValue(WebString());
       bool is_initiating_node = (element == *input_element);
       if (is_initiating_node)
         input_element->setAutofilled(was_autofilled);
       else
         input_element->setAutofilled(false);
 
       // Clearing the suggested value in the focused node (above) can cause
       // selection to be lost. We force selection range to restore the text
       // cursor.
       if (is_initiating_node) {
         int length = input_element->value().length();
         input_element->setSelectionRange(length, length);
       }
     } else if (IsTextAreaElement(control_element)) {
       WebTextAreaElement text_area = control_element.to<WebTextAreaElement>();
       text_area.setSuggestedValue(WebString());
       bool is_initiating_node = (element == text_area);
       if (is_initiating_node)
         control_element.setAutofilled(was_autofilled);
       else
         control_element.setAutofilled(false);
+    } else if (IsSelectElement(control_element)) {
+      WebSelectElement select_element = control_element.to<WebSelectElement>();
+      select_element.setSuggestedValue(WebString());
+      bool is_initiating_node = (element == select_element);
+      if (is_initiating_node)
+        control_element.setAutofilled(was_autofilled);
+      else
+        control_element.setAutofilled(false);

[Ilya Sherman, 2014/02/08 01:40:41]

There's no need for handling the case where is_initiating_node is set to true,
because it's impossible to initiate Autofill from a <select> element.

+
+      // Set selected option back to the original one. Ideally this should
+      // happen right in the end of PreviewForm() but doing so will overwrite
+      // the preview value.
+      select_element.setValue(WebString(select_element.originalValue()));

[Ilya Sherman, 2014/02/08 01:40:41]

This should not be necessary; the <select> element should keep track of this
state internally.

     }
   }
 
   return true;
 }
 
 bool FormWithElementIsAutofilled(const WebInputElement& element) {
   WebFormElement form_element = element.form();
   if (form_element.isNull())
     return false;
@@ skipping 57 matching lines @@
         break;
       }
     }
     if (!tag_is_allowed)
       return false;
   }
   return true;
 }
 
 }  // namespace autofill