Add supports that allow Autofill to be initiated from textarea field

components/autofill/content/renderer/autofill_agent.cc

Index: components/autofill/content/renderer/autofill_agent.cc
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 85f4fad689dba9c397ecd85020a124a18a65f86d..73a60848f85575ef47a0f8aed777f80c4201011f 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -55,6 +55,7 @@ using blink::WebNode;
 using blink::WebElementCollection;

[Ilya Sherman, 2014/02/22 06:24:20]

nit: While you're here, mind alpha-sorting this line?

 using blink::WebOptionElement;
 using blink::WebString;
+using blink::WebTextAreaElement;
 
 namespace autofill {
 
@@ -286,14 +287,20 @@ void AutofillAgent::setIgnoreTextChanges(bool ignore) {
   ignore_text_changes_ = ignore;
 }
 
-void AutofillAgent::InputElementClicked(const WebInputElement& element,
-                                        bool was_focused,
-                                        bool is_focused) {
+void AutofillAgent::FormControlElementClicked(
+    const WebFormControlElement& element,
+    bool was_focused,
+    bool is_focused) {
+  const WebInputElement* input_element = toWebInputElement(&element);
+  if (!IsAutofillableInputElement(input_element) &&
+      !IsTextAreaElement(element))
+    return;

[Ilya Sherman, 2014/02/22 06:24:20]

nit: Please leave a blank line after this one.

   if (was_focused)
     ShowSuggestions(element, true, false, true, false);
 }
 
-void AutofillAgent::InputElementLostFocus() {
+// This applies to both input and textarea elements

[Ilya Sherman, 2014/02/22 06:24:20]

nit: This comment doesn't seem very useful to anyone who's not thinking about it
in context of this CL.  I'd omit it.

+void AutofillAgent::FormControlElementLostFocus() {
   HideAutofillUI();
 }
 
@@ -303,7 +310,15 @@ void AutofillAgent::textFieldDidEndEditing(const WebInputElement& element) {
   Send(new AutofillHostMsg_DidEndTextFieldEditing(routing_id()));
 }
 
+// TODO: This function is to be removed once next Blink roll is done
 void AutofillAgent::textFieldDidChange(const WebInputElement& element) {
+  const WebFormControlElement control_element =
+      element.toConst<WebFormControlElement>();
+  textFieldDidChange(control_element);
+}
+
+// Text changes in input text field or textarea field

[Ilya Sherman, 2014/02/22 06:24:20]

Ditto.

+void AutofillAgent::textFieldDidChange(const WebFormControlElement& element) {
   if (ignore_text_changes_)
     return;
 
@@ -323,27 +338,38 @@ void AutofillAgent::textFieldDidChange(const WebInputElement& element) {
                  element));
 }
 
-void AutofillAgent::TextFieldDidChangeImpl(const WebInputElement& element) {
+void AutofillAgent::TextFieldDidChangeImpl(const WebFormControlElement& element)
+{

[Ilya Sherman, 2014/02/22 06:24:20]

nit: In the Chromium repository, curly braces should always be on the same line
as the closing paren.  In this case, that means that the function parameter
needs to wrap.

   // If the element isn't focused then the changes don't matter. This check is
   // required to properly handle IME interactions.
   if (!element.focused())
     return;
 
-  if (password_generation_agent_ &&
-      password_generation_agent_->TextDidChangeInTextField(element)) {
+  const WebInputElement* input_element = toWebInputElement(&element);
+  if (!IsAutofillableInputElement(input_element) &&
+      !IsTextAreaElement(element))
     return;
-  }
 
-  if (password_autofill_agent_->TextDidChangeInTextField(element)) {
-    element_ = element;
-    return;
+  if (IsAutofillableInputElement(input_element)) {
+    if (password_generation_agent_ &&
+        password_generation_agent_->TextDidChangeInTextField(*input_element)) {
+      return;
+    }
+
+    if (password_autofill_agent_->TextDidChangeInTextField(*input_element)) {
+      element_ = element;
+      return;
+    }
   }
 
   ShowSuggestions(element, false, true, false, false);
 
   FormData form;
   FormFieldData field;
-  if (FindFormAndFieldForInputElement(element, &form, &field, REQUIRE_NONE)) {
+  if (FindFormAndFieldForFormControlElement(element,
+                                            &form,
+                                            &field,
+                                            REQUIRE_NONE)) {
     Send(new AutofillHostMsg_TextFieldDidChange(routing_id(), form, field,
                                                 base::TimeTicks::Now()));
   }
@@ -367,14 +393,17 @@ void AutofillAgent::openTextDataListChooser(const WebInputElement& element) {
 
 void AutofillAgent::AcceptDataListSuggestion(
     const base::string16& suggested_value) {
+  WebInputElement* input_element = toWebInputElement(&element_);
+  if (!input_element)
+    return;

[Ilya Sherman, 2014/02/22 06:24:20]

nit: Please leave a blank line after this one.

   base::string16 new_value = suggested_value;
   // If this element takes multiple values then replace the last part with
   // the suggestion.
-  if (element_.isMultiple() &&
-      element_.formControlType() == WebString::fromUTF8("email")) {
+  if (input_element->isMultiple() &&
+      input_element->formControlType() == WebString::fromUTF8("email")) {
     std::vector<base::string16> parts;
 
-    base::SplitStringDontTrim(element_.editingValue(), ',', &parts);
+    base::SplitStringDontTrim(input_element->editingValue(), ',', &parts);
     if (parts.size() == 0)
       parts.push_back(base::string16());
 
@@ -391,7 +420,7 @@ void AutofillAgent::AcceptDataListSuggestion(
 
     new_value = JoinString(parts, ',');
   }
-  SetNodeText(new_value, &element_);
+  SetNodeText(new_value, input_element);
 }
 
 void AutofillAgent::OnFormDataFilled(int query_id,
@@ -453,7 +482,10 @@ void AutofillAgent::OnClearPreviewedForm() {
 }
 
 void AutofillAgent::OnSetNodeText(const base::string16& value) {
-  SetNodeText(value, &element_);
+  WebInputElement* input_element = toWebInputElement(&element_);
+  if (!input_element)
+    return;

[Ilya Sherman, 2014/02/22 06:24:20]

nit: Please leave a blank line after this one.

+  SetNodeText(value, input_element);
 }
 
 void AutofillAgent::OnAcceptDataListSuggestion(const base::string16& value) {
@@ -489,34 +521,43 @@ void AutofillAgent::OnRequestAutocompleteResult(
 void AutofillAgent::OnPageShown() {
 }
 
-void AutofillAgent::ShowSuggestions(const WebInputElement& element,
+void AutofillAgent::ShowSuggestions(const WebFormControlElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
                                     bool display_warning_if_disabled,
                                     bool datalist_only) {
-  if (!element.isEnabled() || element.isReadOnly() || !element.isTextField() ||
-      element.isPasswordField())
-    return;
-  if (!datalist_only && !element.suggestedValue().isEmpty())
+  const WebInputElement* input_element = toWebInputElement(&element);

[Ilya Sherman, 2014/02/22 06:24:20]

nit: Please move this down to where it is used.

+  if (!element.isEnabled() || element.isReadOnly())
     return;
 
-  // Don't attempt to autofill with values that are too large or if filling
-  // criteria are not met.
-  WebString value = element.editingValue();
-  if (!datalist_only &&
-      (value.length() > kMaxDataLength ||
-       (!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.
-    HideAutofillUI();
-    return;
-  }
+  if (IsAutofillableInputElement(input_element)) {
+    if (!input_element->isTextField() || input_element->isPasswordField())
+      return;
+    if (!datalist_only && !input_element->suggestedValue().isEmpty())
+      return;
+    // Don't attempt to autofill with values that are too large or if filling
+    // criteria are not met.
+    WebString value = input_element->editingValue();
+    if (!datalist_only &&
+        (value.length() > kMaxDataLength ||
+         (!autofill_on_empty_values && value.isEmpty()) ||
+         (requires_caret_at_end &&
+          (input_element->selectionStart() != input_element->selectionEnd() ||
+           input_element->selectionEnd() !=
+               static_cast<int>(value.length()))))) {

[Ilya Sherman, 2014/02/22 06:24:20]

All of these criteria should apply to text areas as well as to single-line text
fields.

+      // Any popup currently showing is obsolete.
+      HideAutofillUI();
+      return;
+    }
 
-  element_ = element;
-  if (password_autofill_agent_->ShowSuggestions(element))
-    return;
+    element_ = element;
+    if (password_autofill_agent_->ShowSuggestions(*input_element))
+      return;
+  } else if (IsTextAreaElement(element)) {
+    if (!element.toConst<WebTextAreaElement>().suggestedValue().isEmpty())
+      return;
+    element_ = element;
+  }
 
   // If autocomplete is disabled at the field level, ensure that the native
   // UI won't try to show a warning, since that may conflict with a custom
@@ -533,27 +574,33 @@ void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                            datalist_only);
 }
 
-void AutofillAgent::QueryAutofillSuggestions(const WebInputElement& element,
-                                             bool display_warning_if_disabled,
-                                             bool datalist_only) {
+void AutofillAgent::QueryAutofillSuggestions(
+    const WebFormControlElement& element,
+    bool display_warning_if_disabled,
+    bool datalist_only) {
   if (!element.document().frame())
     return;
 
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
   display_warning_if_disabled_ = display_warning_if_disabled;
+  const WebInputElement* input_element = toWebInputElement(&element);
 
   // If autocomplete is disabled at the form level, we want to see if there
   // would have been any suggestions were it enabled, so that we can show a
   // warning.  Otherwise, we want to ignore fields that disable autocomplete, so
   // that the suggestions list does not include suggestions for these form
   // fields -- see comment 1 on http://crbug.com/69914
-  const RequirementsMask requirements =
-      element.autoComplete() ? REQUIRE_AUTOCOMPLETE : REQUIRE_NONE;
+  RequirementsMask requirements = REQUIRE_NONE;
+  if (IsAutofillableInputElement(input_element)) {
+    requirements =
+        input_element->autoComplete() ? REQUIRE_AUTOCOMPLETE : REQUIRE_NONE;
+  }

[Ilya Sherman, 2014/02/22 06:24:20]

Equivalent logic should apply to textarea fields as well.

 
   FormData form;
   FormFieldData field;
-  if (!FindFormAndFieldForInputElement(element, &form, &field, requirements)) {
+  if (!FindFormAndFieldForFormControlElement(element, &form, &field,
+                                             requirements)) {
     // If we didn't find the cached form, at least let autocomplete have a shot
     // at providing suggestions.
     WebFormControlElementToFormField(element, EXTRACT_VALUE, &field);
@@ -564,20 +611,21 @@ void AutofillAgent::QueryAutofillSuggestions(const WebInputElement& element,
   gfx::RectF bounding_box_scaled =
       GetScaledBoundingBox(web_view_->pageScaleFactor(), &element_);
 
-  // Find the datalist values and send them to the browser process.
-  std::vector<base::string16> data_list_values;
-  std::vector<base::string16> data_list_labels;
-  GetDataListSuggestions(element_,
+  if (IsAutofillableInputElement(input_element)) {
+    // Find the datalist values and send them to the browser process.
+    std::vector<base::string16> data_list_values;
+    std::vector<base::string16> data_list_labels;
+    GetDataListSuggestions(*input_element,
                          datalist_only,
                          &data_list_values,
                          &data_list_labels);

[Ilya Sherman, 2014/02/22 06:24:20]

nit: Please fix alignment for these three lines.

-  TrimStringVectorForIPC(&data_list_values);
-  TrimStringVectorForIPC(&data_list_labels);
+    TrimStringVectorForIPC(&data_list_values);
+    TrimStringVectorForIPC(&data_list_labels);
 
-  Send(new AutofillHostMsg_SetDataList(routing_id(),
+    Send(new AutofillHostMsg_SetDataList(routing_id(),
                                        data_list_values,
                                        data_list_labels));
-
+  }
   Send(new AutofillHostMsg_QueryFormFieldAutofill(routing_id(),
                                                   autofill_query_id_,
                                                   form,
@@ -596,8 +644,11 @@ void AutofillAgent::FillAutofillFormData(const WebNode& node,
 
   FormData form;
   FormFieldData field;
-  if (!FindFormAndFieldForInputElement(node.toConst<WebInputElement>(), &form,
-                                       &field, REQUIRE_AUTOCOMPLETE)) {
+  if (!FindFormAndFieldForFormControlElement(
+           node.toConst<WebFormControlElement>(),
+           &form,
+           &field,
+           REQUIRE_AUTOCOMPLETE)) {
     return;
   }