Requery the autofill server when forms and input fields are dynamically added.

components/autofill/renderer/autofill_agent.cc

 // Copyright (c) 2012 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/renderer/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 134 matching lines @@
       autofill_query_id_(0),
       autofill_action_(AUTOFILL_NONE),
       topmost_frame_(NULL),
       web_view_(render_view->GetWebView()),
       display_warning_if_disabled_(false),
       was_query_node_autofilled_(false),
       has_shown_autofill_popup_for_current_edit_(false),
       did_set_node_text_(false),
       autocheckout_click_in_progress_(false),
       is_whitelisted_for_autocheckout_(false),
+      has_new_forms_for_browser_(false),
       ignore_text_changes_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   render_view->GetWebView()->setAutofillClient(this);
 
   // The PageClickTracker is a RenderViewObserver, and hence will be freed when
   // the RenderView is destroyed.
   new PageClickTracker(render_view, this);
 }
 
 AutofillAgent::~AutofillAgent() {}
@@ skipping 43 matching lines @@
   if (!frame->parent()) {
     topmost_frame_ = frame;
     form_elements_.clear();
     has_more_forms = form_cache_.ExtractFormsAndFormElements(
         *frame, kRequiredAutofillFields, &forms, &form_elements_);
     is_whitelisted_for_autocheckout_ = false;
   } else {
     form_cache_.ExtractForms(*frame, &forms);
   }
 
+  autofill::FormsSeenState state = has_more_forms ?
+      autofill::PARTIAL_FORMS_SEEN : autofill::NO_SPECIAL_FORMS_SEEN;
+
   // Always communicate to browser process for topmost frame.
   if (!forms.empty() || !frame->parent()) {
     Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
                                        forms_seen_timestamp_,
-                                       has_more_forms));
+                                       state));
   }
 }
 
 void AutofillAgent::DidStartProvisionalLoad(WebFrame* frame) {
   if (!frame->parent()) {
     topmost_frame_ = NULL;
     if (click_timer_.IsRunning()) {
       click_timer_.Stop();
       autocheckout_click_in_progress_ = true;
     }
@@ skipping 488 matching lines @@
   std::vector<FormData> forms;
   form_cache_.ExtractFormsAndFormElements(
       *topmost_frame_, 0, &forms, &form_elements_);
 
   // OnGetAllForms should only be called if AutofillAgent reported to
   // AutofillManager that there are more forms
   DCHECK(!forms.empty());
 
   // Report to AutofillManager that all forms are being sent.
   Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
-                                     forms_seen_timestamp_, false));
+                                     forms_seen_timestamp_,
+                                     NO_SPECIAL_FORMS_SEEN));
 }
 
 void AutofillAgent::OnRequestAutocompleteResult(
     WebFormElement::AutocompleteResult result, const FormData& form_data) {
   if (in_flight_request_form_.isNull())
     return;
 
   if (result == WebFormElement::AutocompleteResultSuccess)
     FillFormIncludingNonFocusableElements(form_data, in_flight_request_form_);
 
@@ skipping 27 matching lines @@
   if (!ClickElement(topmost_frame_->document(),
                     click_element_descriptor)) {
     click_timer_.Stop();
     Send(new AutofillHostMsg_ClickFailed(routing_id(),
                                          MISSING_ADVANCE));
   }
 }
 
 void AutofillAgent::OnWhitelistedForAutocheckout() {
   is_whitelisted_for_autocheckout_ = true;
+  if (has_new_forms_for_browser_)
+    MaybeSendDynamicFormsSeen();
 }
 
 void AutofillAgent::ClickFailed() {
   Send(new AutofillHostMsg_ClickFailed(routing_id(),
                                        CANNOT_PROCEED));
 }
 
 void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
@@ skipping 140 matching lines @@
   if (web_view)
     web_view->hidePopups();
 
   HideHostAutofillUi();
 }
 
 void AutofillAgent::HideHostAutofillUi() {
   Send(new AutofillHostMsg_HideAutofillUi(routing_id()));
 }
 
+void AutofillAgent::didAssociateFormControls(
+    const WebKit::WebVector<WebKit::WebNode>& nodes) {
+  for (size_t i = 0; i < nodes.size(); ++i) {
+    WebKit::WebNode node = nodes[i];
+    if (node.document().frame() == topmost_frame_) {
+      forms_seen_timestamp_ = base::TimeTicks::Now();
+      has_new_forms_for_browser_ = true;
+      break;
+    }
+  }
+
+  if (has_new_forms_for_browser_ && is_whitelisted_for_autocheckout_)
+    MaybeSendDynamicFormsSeen();
+}
+
+void AutofillAgent::MaybeSendDynamicFormsSeen() {
+  has_new_forms_for_browser_ = false;
+  form_elements_.clear();
+  std::vector<FormData> forms;
+  // This will only be called for Autocheckout flows, so send all forms to
+  // save an IPC

[Ilya Sherman, 2013/04/18 22:19:08]

nit: Please end the sentence with a period.

[Dane Wallinga, 2013/04/18 23:56:44]

Done.

+  bool has_more_forms = form_cache_.ExtractFormsAndFormElements(
+      *topmost_frame_, 0, &forms, &form_elements_);

[Ilya Sherman, 2013/04/18 22:19:08]

Can calling this method with a threshold of 0 ever cause has_more_forms to be
true?

[Dane Wallinga, 2013/04/18 23:56:44]

gah, knew I missed something.

+  autofill::FormsSeenState state = has_more_forms ?
+      autofill::PARTIAL_AND_DYNAMIC_FORMS_SEEN : autofill::DYNAMIC_FORMS_SEEN;

[Ilya Sherman, 2013/04/19 01:38:42]

Is the PARTIAL_AND_DYNAMIC_FORMS_SEEN case reachable anymore?

[Dane Wallinga, 2013/04/19 18:19:53]

Not presently. It would be applicable if you ever want to support normal
autofill for dynamic forms, but if you're hinting that I should remove it from
FromsSeenState until that eventuality arises, I have no objection.

+
+  if (!forms.empty()) {
+    if (click_timer_.IsRunning())
+      click_timer_.Stop();

[Ilya Sherman, 2013/04/18 22:19:08]

Why is this part MaybeSendDynamicFormsSeen() and not didAssociateFormControls()?

[Dane Wallinga, 2013/04/18 23:56:44]

I don't want to clear the timer until I know that AutofillManager is going to
try to check the field mappings again, and I don't know that until after that
!forms.empty() check. If I cleared the timer and AutofillManager didn't check
the field mappings, there could be some (admittedly strange) error case where
some form element gets immediately added, and then removed, the buyflow doesn't
advance correctly, and then nothing notices and so we leave the UI open
indefinitely.

[Ilya Sherman, 2013/04/19 01:38:42]

That doesn't match how the logic in DidStartProvisionalLoad() works.  IMO the
two should be parallel.

Also, looking at that method, it seems that you likely should be setting
autocheckout_click_in_progress_ to false here.

[Dane Wallinga, 2013/04/19 18:19:53]

If the provisional load fails, we'll call ClickFailed. If not, we'll send
FormsSeen when the document load completes (which we always do for the topmost
frame whether there are new forms or not), leaving AutofillManager to check for
problems. Now I suppose we could always send the IPC for dynamic forms as well,
but the flow is different enough that we can get by with only sending the IPC
for new forms *if* we don't clear the timer until we know we're sending
something.

autocheckout_click_in_progress_ should already be false here. It gets set true
in DidStartProvisionalLoad() if the timer is running as a way of noting that a
click was in progress in case the provisional load fails. Doesn't really apply
in this case.

+    Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
+                                       forms_seen_timestamp_,
+                                       state));
+  }
+}
+
 }  // namespace autofill