Autofill: one FormCache per WebFrame.

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 115 matching lines @@
       display_warning_if_disabled(false),
       datalist_only(false),
       show_full_suggestion_list(false),
       show_password_suggestions_only(false) {
 }
 
 AutofillAgent::AutofillAgent(content::RenderFrame* render_frame,
                              PasswordAutofillAgent* password_autofill_agent,
                              PasswordGenerationAgent* password_generation_agent)
     : content::RenderFrameObserver(render_frame),
+      form_cache_(*render_frame->GetWebFrame()),
       password_autofill_agent_(password_autofill_agent),
       password_generation_agent_(password_generation_agent),
       legacy_(render_frame->GetRenderView(), this),
       page_click_tracker_(render_frame->GetRenderView(), this),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       was_query_node_autofilled_(false),
       has_shown_autofill_popup_for_current_edit_(false),
       did_set_node_text_(false),
       ignore_text_changes_(false),
@@ skipping 26 matching lines @@
     IPC_MESSAGE_HANDLER(AutofillMsg_PreviewPasswordSuggestion,
                         OnPreviewPasswordSuggestion)
     IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteResult,
                         OnRequestAutocompleteResult)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void AutofillAgent::DidCommitProvisionalLoad(bool is_new_navigation) {
-  // TODO(estade): |form_cache_| shouldn't track multiple frames.
-  form_cache_.ResetFrame(*render_frame()->GetWebFrame());
+  form_cache_.Reset();
 }
 
 void AutofillAgent::DidFinishDocumentLoad() {
   ProcessForms();
 }
 
 void AutofillAgent::FrameDetached(WebFrame* frame) {
   if (frame != render_frame()->GetWebFrame())
     return;
 
-  form_cache_.ResetFrame(*frame);
+  form_cache_.Reset();
 }
 
 void AutofillAgent::WillSubmitForm(WebLocalFrame* frame,
                                    const WebFormElement& form) {
   if (frame != render_frame()->GetWebFrame())
     return;
 
   FormData form_data;
   if (WebFormElementToFormData(form,
                                WebFormControlElement(),
@@ skipping 536 matching lines @@
   node->setSelectionRange(node->value().length(),
                           node->suggestedValue().length());
 }
 
 void AutofillAgent::ProcessForms() {
   // Record timestamp of when the forms are first seen. This is used to
   // measure the overhead of the Autofill feature.
   base::TimeTicks forms_seen_timestamp = base::TimeTicks::Now();
 
   WebLocalFrame* frame = render_frame()->GetWebFrame();
-  std::vector<FormData> forms = form_cache_.ExtractNewForms(*frame);
+  std::vector<FormData> forms = form_cache_.ExtractNewForms();
 
   // Always communicate to browser process for topmost frame.
   if (!forms.empty() || !frame->parent()) {
     Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
                                        forms_seen_timestamp));
   }
 }
 
 void AutofillAgent::HidePopup() {
   if (!is_popup_possibly_visible_)
@@ skipping 65 matching lines @@
 void AutofillAgent::LegacyAutofillAgent::Resized() {
   agent_->Resized();
 }
 
 void AutofillAgent::LegacyAutofillAgent::FrameWillClose(
     blink::WebFrame* frame) {
   agent_->LegacyFrameWillClose(frame);
 }
 
 }  // namespace autofill