Fix for: State in small letters should be auto-filled from the profile....

chrome/renderer/form_manager.cc

 // Copyright (c) 2010 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/form_manager.h"
 
 #include "base/logging.h"
 #include "base/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebLabelElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebOptionElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSelectElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 using WebKit::WebDocument;
 using WebKit::WebElement;
 using WebKit::WebFormControlElement;
 using WebKit::WebFormElement;
 using WebKit::WebFrame;
 using WebKit::WebInputElement;
 using WebKit::WebLabelElement;
 using WebKit::WebNode;
 using WebKit::WebNodeList;
+using WebKit::WebOptionElement;
 using WebKit::WebSelectElement;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 namespace {
 
 // The number of fields required by AutoFill.  Ideally we could send the forms
 // to AutoFill no matter how many fields are in the forms; however, finding the
 // label for each field is a costly operation and we can't spare the cycles if
 // it's not necessary.
@@ skipping 157 matching lines @@
         if (element.hasTagName("dt")) {
           inferred_label = FindChildText(element);
         }
       }
     }
   }
 
   return inferred_label;
 }
 
+void GetOptionStringsFromElement(WebKit::WebFormControlElement element,
+                                 std::vector<string16>* option_strings) {
+  DCHECK(!element.isNull());
+  DCHECK(option_strings);
+  option_strings->clear();
+  if (element.formControlType() == ASCIIToUTF16("select-one")) {
+    WebSelectElement select_element = element.to<WebSelectElement>();
+
+    // For select-one elements copy option strings.
+    WebVector<WebElement> list_items = select_element.listItems();
+    option_strings->reserve(list_items.size());
+    for (size_t i = 0; i < list_items.size(); ++i) {
+      if (list_items[i].hasTagName("option"))
+        option_strings->push_back(list_items[i].to<WebOptionElement>().value());
+    }
+  }
+}
+
 }  // namespace
 
 FormManager::FormManager() {
 }
 
 FormManager::~FormManager() {
   Reset();
 }
 
 // static
 void FormManager::WebFormControlElementToFormField(
     const WebFormControlElement& element, bool get_value, FormField* field) {
   DCHECK(field);
 
   // The label is not officially part of a WebFormControlElement; however, the
   // labels for all form control elements are scraped from the DOM and set in
   // WebFormElementToFormData.
   field->set_name(element.nameForAutofill());
   field->set_form_control_type(element.formControlType());
 
+  // Set option strings on the field if available.
+  std::vector<string16> option_strings;
+  GetOptionStringsFromElement(element, &option_strings);
+  field->set_option_strings(option_strings);
+
   if (element.formControlType() == WebString::fromUTF8("text")) {
     const WebInputElement& input_element = element.toConst<WebInputElement>();
     field->set_size(input_element.size());
   }
 
   if (!get_value)
     return;
 
   // TODO(jhawkins): In WebKit, move value() and setValue() to
   // WebFormControlElement.
@@ skipping 613 matching lines @@
     return;
 
   WebInputElement input_element = field->to<WebInputElement>();
 
   // 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);
 }