Add autofill preview support for Textarea

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 554 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;
 
-  // Only preview input fields. Excludes checkboxes and radio buttons, as there
-  // is no provision for setSuggestedCheckedValue in WebInputElement.
+  // Preview input and textarea 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))
-    return;
-
-  // If the maxlength attribute contains a negative value, maxLength()
-  // returns the default maxlength value.
-  input_element->setSuggestedValue(
+  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());
+      input_element->setAutofilled(true);

[Ilya Sherman, 2014/01/07 01:09:38]

nit: Please de-indent this line two spaces.

[ziran.sun, 2014/01/07 16:40:41]

Done.

+    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());

[Ilya Sherman, 2014/01/07 01:09:38]

nit: Indentation is off here.  Please format this as below, so that the
arguments are aligned:

      input_element->setSelectionRange(
          input_element->value().length(),
          input_element->suggestedValue().length());

[ziran.sun, 2014/01/07 16:40:41]

Done.

+    }
+  } else if (IsTextAreaElement(*field)) {
+    WebTextAreaElement textarea = field->to<WebTextAreaElement>();
+    textarea.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 442 matching lines @@
 bool ClearPreviewedFormWithElement(const WebInputElement& element,
                                    bool was_autofilled) {
   WebFormElement form_element = element.form();
   if (form_element.isNull())
     return false;
 
   std::vector<WebFormControlElement> control_elements;
   ExtractAutofillableElements(form_element, REQUIRE_AUTOCOMPLETE,
                               &control_elements);
   for (size_t i = 0; i < control_elements.size(); ++i) {
-    // Only text input elements can be previewed.
+    // Only text input and textarea elements can be previewed.
     WebInputElement* input_element = toWebInputElement(&control_elements[i]);
-    if (!IsTextInput(input_element))
+    if (!IsTextInput(input_element) && !IsTextAreaElement(control_elements[i]))
       continue;
 
-    // If the input element is not auto-filled, we did not preview it, so there
-    // is nothing to reset.
-    if (!input_element->isAutofilled())
+    // If the element is not auto-filled, we did not preview it,
+    // so there is nothing to reset.
+    if(!control_elements[i].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())
+    WebFormControlElement control_element = control_elements[i];

[Ilya Sherman, 2014/01/07 01:09:38]

nit: I'd recommend moving this to the top of the loop, so that you can use it on
lines 1057, 1058, and 1063.

[ziran.sun, 2014/01/07 16:40:41]

Done.

+    if ((IsTextInput(input_element) &&
+       input_element->suggestedValue().isEmpty())
+       || (IsTextAreaElement(control_element) &&
+       control_element.to<WebTextAreaElement>().suggestedValue().isEmpty()))

[Ilya Sherman, 2014/01/07 01:09:38]

This is still not wrapped correctly.  Specifically, (1) when wrapping code at
operators like "||" and "&&", the operators should always appear at the end of
the wrapped line, rather than at the start of the next line; and (2) parts of a
single expression that is &&'ed or ||'ed together should be aligned.  Again, the
appropriate formatting for this if-stmt is

   WebFormControlElement control_element = control_elements[i];
   if ((IsTextInput(input_element) &&
        input_element->suggestedValue().isEmpty()) ||
       (IsTextAreaElement(control_element) &&
        control_element.to<WebTextAreaElement>().suggestedValue().isEmpty()))
     continue;

[ziran.sun, 2014/01/07 16:40:41]

Done.

       continue;
 
     // Clear the suggested value. For the initiating node, also restore the
     // original value.
-    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);
+    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);

[Ilya Sherman, 2014/01/07 01:09:38]

Lines 1081-1085 are essentially duplicated on lines 1097-1101.  Please refactor
the code so that they are shared instead, unless this is not possible (or is
possible but looks ugly).

[ziran.sun, 2014/01/07 16:40:41]

This could look ugly. Check other functions, e.g. FillFormField(),  it might
look a bit clear while handle each of these cases (input, textarea, selection)
separately?

[Ilya Sherman, 2014/01/08 04:13:47]

Alright, I guess it's ok as is.  Thanks.

 
-    // 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);
+      // 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);
     }
   }
 
   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