Autofill: Modify various utility function to deal with unowned form fields.

components/autofill/content/renderer/autofill_agent.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/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
@@ skipping 645 matching lines @@
       display_warning = false;
   }
 
   QueryAutofillSuggestions(element, display_warning, options.datalist_only);
 }
 
 void AutofillAgent::QueryAutofillSuggestions(
     const WebFormControlElement& element,
     bool display_warning_if_disabled,
     bool datalist_only) {
-  if (!element.document().frame())
+  blink::WebDocument document = element.document();
+  if (!document.frame())
     return;
 
   DCHECK(toWebInputElement(&element) || IsTextAreaElement(element));
 
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
   display_warning_if_disabled_ = display_warning_if_disabled;
 
   // 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
   RequirementsMask requirements =
       element.autoComplete() ? REQUIRE_AUTOCOMPLETE : REQUIRE_NONE;
 
   // If we're ignoring autocomplete="off", always extract everything.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kRespectAutocompleteOffForAutofill)) {
     requirements = REQUIRE_NONE;
   }
 
   FormData form;
   FormFieldData field;
   if (!FindFormAndFieldForFormControlElement(element, &form, &field,

[Evan Stade, 2014/12/12 19:59:35]

hmmm, why doesn't the unowned form just go in the cache at initial parse time?

[Lei Zhang, 2014/12/12 22:06:23]

FindFormAndFieldForFormControlElement() works on the live WebDocument to get the
current form.fields, not the cached copies, so we need to do the same for the
synthetic form. I first tried the cached copy approach and many tests fail, e.g.
FormAutofillTest.FindFormForInputElementForUnownedForm.

                                              requirements)) {
-    // If we didn't find the cached form, at least let autocomplete have a shot
-    // at providing suggestions.
-    WebFormControlElementToFormField(element, EXTRACT_VALUE, &field);
+    // No associated form element, try the form for unowned form elements.

[Evan Stade, 2014/12/12 19:59:35]

nit: s/form for/synthetic form for/

[Lei Zhang, 2014/12/12 22:06:23]

Done.

+    FormData unowned_form;
+    FormFieldData unowned_field;
+    std::vector<WebElement> fieldsets;
+    std::vector<WebFormControlElement> control_elements =
+        GetUnownedAutofillableFormFieldElements(document.all(), &fieldsets);
+    const ExtractMask extract_mask =

[Evan Stade, 2014/12/12 19:59:35]

nit: dislike this variable because it makes it seem like it's going to be used
more than once

[Lei Zhang, 2014/12/12 22:06:23]

Done.

+        static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTIONS);
+    if (UnownedFormElementsAndFieldSetsToFormData(fieldsets, control_elements,
+                                                  &element, document.url(),
+                                                  requirements, extract_mask,
+                                                  &unowned_form,
+                                                  &unowned_field)) {
+      form = unowned_form;
+      field = unowned_field;
+    } else {
+      // If we didn't find the cached form, at least let autocomplete have a
+      // shot at providing suggestions.
+      WebFormControlElementToFormField(element, EXTRACT_VALUE, &field);
+    }
   }
   if (datalist_only)
     field.should_autocomplete = false;
 
   gfx::RectF bounding_box_scaled = GetScaledBoundingBox(
       render_frame()->GetRenderView()->GetWebView()->pageScaleFactor(),
       &element_);
 
   std::vector<base::string16> data_list_values;
   std::vector<base::string16> data_list_labels;
@@ skipping 121 matching lines @@
 void AutofillAgent::LegacyAutofillAgent::Resized() {
   agent_->Resized();
 }
 
 void AutofillAgent::LegacyAutofillAgent::FrameWillClose(
     blink::WebFrame* frame) {
   agent_->LegacyFrameWillClose(frame);
 }
 
 }  // namespace autofill