Support autocompletion for HTMl5 tags:"email", "month" and "tel".

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"
@@ skipping 255 matching lines @@
     // 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());
     }
   }
 }
 
+// In HTML5, all text fields except password are text input fields to
+// autocomplete.
+static bool IsTextInput(const WebInputElement* element) {
+  if (!element)
+    return false;
+
+  return element->isTextField() && !element->isPasswordField();
+}
+
 }  // namespace
 
 struct FormManager::FormElement {
   WebKit::WebFormElement form_element;
   std::vector<WebKit::WebFormControlElement> control_elements;
   std::vector<string16> control_values;
 };
 
 FormManager::FormManager() {
 }
@@ skipping 15 matching lines @@
   field->set_name(element.nameForAutofill());
   field->set_form_control_type(element.formControlType());
 
   if (extract_mask & EXTRACT_OPTIONS) {
     // 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_max_length(input_element.maxLength());
-    field->set_autofilled(input_element.isAutofilled());
+  const WebInputElement* input_element =
+      WebInputElement::toWebInputElement(&element);
+  if (IsTextInput(input_element)) {
+    field->set_max_length(input_element->maxLength());
+    field->set_autofilled(input_element->isAutofilled());
   }
 
   if (!(extract_mask & EXTRACT_VALUE))
     return;
 
   // TODO(jhawkins): In WebKit, move value() and setValue() to
   // WebFormControlElement.
   string16 value;
-  if (element.formControlType() == WebString::fromUTF8("text") ||
+  if (IsTextInput(input_element) ||
       element.formControlType() == WebString::fromUTF8("hidden")) {
-    const WebInputElement& input_element =
-        element.toConst<WebInputElement>();
-    value = input_element.value();
+    value = input_element->value();
   } else if (element.formControlType() == WebString::fromUTF8("select-one")) {
     // TODO(jhawkins): This is ugly.  WebSelectElement::value() is a non-const
     // method.  Look into fixing this on the WebKit side.
     WebFormControlElement& e = const_cast<WebFormControlElement&>(element);
     WebSelectElement select_element = e.to<WebSelectElement>();
     value = select_element.value();
 
     // Convert the |select_element| value to text if requested.
     if (extract_mask & EXTRACT_OPTION_TEXT) {
       WebVector<WebElement> list_items = select_element.listItems();
@@ skipping 72 matching lines @@
   WebVector<WebFormControlElement> control_elements;
   element.getFormControlElements(control_elements);
 
   // A vector of bools that indicate whether each field in the form meets the
   // requirements and thus will be in the resulting |form|.
   std::vector<bool> fields_extracted(control_elements.size(), false);
 
   for (size_t i = 0; i < control_elements.size(); ++i) {
     const WebFormControlElement& control_element = control_elements[i];
 
+    const WebInputElement* input_element =
+        WebInputElement::toWebInputElement(&control_element);
     if (requirements & REQUIRE_AUTOCOMPLETE &&
-        control_element.formControlType() == WebString::fromUTF8("text")) {
-      const WebInputElement& input_element =
-          control_element.toConst<WebInputElement>();
-      if (!input_element.autoComplete())
+        IsTextInput(input_element)) {
+      if (!input_element->autoComplete())

[Ilya Sherman, 2011/01/25 06:21:30]

nit: No need for nested if-stmts here; you can combine them into a single stmt.

[honten.org, 2011/01/25 06:38:28]

Done.

         continue;
     }
 
     if (requirements & REQUIRE_ENABLED && !control_element.isEnabled())
       continue;
 
     // Create a new FormField, fill it out and map it to the field's name.
     FormField* field = new FormField;
     WebFormControlElementToFormField(control_element, extract_mask, field);
     form_fields.push_back(field);
@@ skipping 189 matching lines @@
   return true;
 }
 
 bool FormManager::ClearFormWithNode(const WebNode& node) {
   FormElement* form_element = NULL;
   if (!FindCachedFormElementWithNode(node, &form_element))
     return false;
 
   for (size_t i = 0; i < form_element->control_elements.size(); ++i) {
     WebFormControlElement element = form_element->control_elements[i];
-    if (element.formControlType() == WebString::fromUTF8("text")) {
-
-      WebInputElement input_element = element.to<WebInputElement>();
+    WebInputElement* input_element =
+        WebInputElement::toWebInputElement(&element);
+    if (IsTextInput(input_element)) {
 
       // We don't modify the value of disabled fields.
-      if (!input_element.isEnabled())
+      if (!input_element->isEnabled())
         continue;
 
-      input_element.setValue(string16());
-      input_element.setAutofilled(false);
+      input_element->setValue(string16());
+      input_element->setAutofilled(false);
 
       // Clearing the value in the focused node (above) can cause selection
       // to be lost. We force selection range to restore the text cursor.
-      if (node == input_element) {
-        int length = input_element.value().length();
-        input_element.setSelectionRange(length, length);
+      if (node == *input_element) {
+        int length = input_element->value().length();
+        input_element->setSelectionRange(length, length);
       }
     } else if (element.formControlType() == WebString::fromUTF8("select-one")) {
       WebSelectElement select_element = element.to<WebSelectElement>();
       select_element.setValue(form_element->control_values[i]);
     }
   }
 
   return true;
 }
 
 bool FormManager::ClearPreviewedFormWithNode(const WebNode& node,
                                              bool was_autofilled) {
   FormElement* form_element = NULL;
   if (!FindCachedFormElementWithNode(node, &form_element))
     return false;
 
   for (size_t i = 0; i < form_element->control_elements.size(); ++i) {
-    WebFormControlElement* element = &form_element->control_elements[i];
-
+    WebInputElement* input_element =
+        WebInputElement::toWebInputElement(&form_element->control_elements[i]);
     // Only input elements can be previewed.
-    if (element->formControlType() != WebString::fromUTF8("text"))
+    if (!IsTextInput(input_element))
       continue;
 
     // If the input element has not been auto-filled, FormManager has not
     // previewed this field, so we have nothing to reset.
-    WebInputElement input_element = element->to<WebInputElement>();
-    if (!input_element.isAutofilled())
+    if (!input_element->isAutofilled())
       continue;
 
     // 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.
-    if (input_element.suggestedValue().isEmpty())
+    if (input_element->suggestedValue().isEmpty())
       continue;
 
     // Clear the suggested value. For the initiating node, also restore the
     // original value.
-    input_element.setSuggestedValue(WebString());
-    bool is_initiating_node = (node == input_element);
+    input_element->setSuggestedValue(WebString());
+    bool is_initiating_node = (node == *input_element);
     if (is_initiating_node) {
       // Call |setValue()| to force the renderer to update the field's displayed
       // value.
-      input_element.setValue(input_element.value());
-      input_element.setAutofilled(was_autofilled);
+      input_element->setValue(input_element->value());
+      input_element->setAutofilled(was_autofilled);
     } else {
-      input_element.setAutofilled(false);
+      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);
+      int length = input_element->value().length();
+      input_element->setSelectionRange(length, length);
     }
   }
 
   return true;
 }
 
 void FormManager::Reset() {
   STLDeleteElements(&form_elements_);
 }
 
 void FormManager::ResetFrame(const WebFrame* frame) {
   FormElementList::iterator iter = form_elements_.begin();
   while (iter != form_elements_.end()) {
     if ((*iter)->form_element.document().frame() == frame) {
       delete *iter;
       iter = form_elements_.erase(iter);
     } else {
       ++iter;
     }
   }
 }
 
 bool FormManager::FormWithNodeIsAutoFilled(const WebNode& node) {
   FormElement* form_element = NULL;
   if (!FindCachedFormElementWithNode(node, &form_element))
     return false;
 
   for (size_t i = 0; i < form_element->control_elements.size(); ++i) {
-    WebFormControlElement element = form_element->control_elements[i];
-    if (element.formControlType() != WebString::fromUTF8("text"))
+    WebInputElement* input_element =
+        WebInputElement::toWebInputElement(&form_element->control_elements[i]);
+    if (!IsTextInput(input_element))
       continue;
 
-    const WebInputElement& input_element = element.to<WebInputElement>();
-    if (input_element.isAutofilled())
+    if (input_element->isAutofilled())
       return true;
   }
 
   return false;
 }
 
 // static
 string16 FormManager::InferLabelForElement(
     const WebFormControlElement& element) {
   // Don't scrape labels for hidden elements.
@@ skipping 88 matching lines @@
     if (k >= data.fields.size())
       continue;
 
     DCHECK_EQ(data.fields[k].name(), element_name);
 
     bool is_initiating_node = false;
 
     // More than likely |requirements| will contain REQUIRE_AUTOCOMPLETE and/or
     // REQUIRE_EMPTY, which both require text form control elements, so special-
     // case this type of element.
-    if (element->formControlType() == WebString::fromUTF8("text")) {
-      const WebInputElement& input_element =
-          element->toConst<WebInputElement>();
+    const WebInputElement* input_element =
+        WebInputElement::toWebInputElement(element);
+    if (IsTextInput(input_element)) {
 
       // TODO(jhawkins): WebKit currently doesn't handle the autocomplete
       // attribute for select control elements, but it probably should.
-      if (requirements & REQUIRE_AUTOCOMPLETE && !input_element.autoComplete())
+      if (requirements & REQUIRE_AUTOCOMPLETE && !input_element->autoComplete())
         continue;
 
-      is_initiating_node = (input_element == node);
+      is_initiating_node = (*input_element == node);
       // Don't require the node that initiated the auto-fill process to be
       // empty.  The user is typing in this field and we should complete the
       // value when the user selects a value to fill out.
       if (requirements & REQUIRE_EMPTY &&
           !is_initiating_node &&
-          !input_element.value().isEmpty())
+          !input_element->value().isEmpty())
         continue;
     }
 
     if (requirements & REQUIRE_ENABLED && !element->isEnabled())
       continue;
 
     callback->Run(element, &data.fields[k], is_initiating_node);
 
     // We found a matching form field so move on to the next.
     ++j;
   }
 
   delete callback;
 }
 
 void FormManager::FillFormField(WebFormControlElement* field,
                                 const FormField* data,
                                 bool is_initiating_node) {
   // Nothing to fill.
   if (data->value().empty())
     return;
 
-  if (field->formControlType() == WebString::fromUTF8("text")) {
-    WebInputElement input_element = field->to<WebInputElement>();
+  WebInputElement* input_element = WebInputElement::toWebInputElement(field);
+  if (IsTextInput(input_element)) {
 
     // If the maxlength attribute contains a negative value, maxLength()
     // returns the default maxlength value.
-    input_element.setValue(data->value().substr(0, input_element.maxLength()));
-    input_element.setAutofilled(true);
+    input_element->setValue(
+        data->value().substr(0, input_element->maxLength()));
+    input_element->setAutofilled(true);
     if (is_initiating_node) {
-      int length = input_element.value().length();
-      input_element.setSelectionRange(length, length);
+      int length = input_element->value().length();
+      input_element->setSelectionRange(length, length);
     }
   } else if (field->formControlType() == WebString::fromUTF8("select-one")) {
     WebSelectElement select_element = field->to<WebSelectElement>();
     select_element.setValue(data->value());
   }
 }
 
 void FormManager::PreviewFormField(WebFormControlElement* field,
                                    const FormField* data,
                                    bool is_initiating_node) {
   // Nothing to preview.
   if (data->value().empty())
     return;
 
   // Only preview input fields.
-  if (field->formControlType() != WebString::fromUTF8("text"))
+  WebInputElement* input_element = WebInputElement::toWebInputElement(field);
+  if (!IsTextInput(input_element))
     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);
+  input_element->setSuggestedValue(
+      data->value().substr(0, input_element->maxLength()));
+  input_element->setAutofilled(true);
   if (is_initiating_node)
-    input_element.setSelectionRange(0, input_element.suggestedValue().length());
+    input_element->setSelectionRange(0,
+        input_element->suggestedValue().length());

[Ilya Sherman, 2011/01/25 06:21:30]

nit: Please indent this line so that the leading "i" aligns with the "0" from
the previous line.

[honten.org, 2011/01/25 06:38:28]

Done.

 }