Autofill: one FormCache per WebFrame.

components/autofill/content/renderer/form_cache.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_cache.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/core/common/autofill_constants.h"
-#include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "grit/components_strings.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElementCollection.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
@@ skipping 14 matching lines @@
 using blink::WebNode;
 using blink::WebSelectElement;
 using blink::WebString;
 using blink::WebTextAreaElement;
 using blink::WebVector;
 
 namespace autofill {
 
 namespace {
 
-// Helper function to discard state of various WebFormElements when they go out
-// of web frame's scope. This is done to release memory that we no longer need
-// to hold.
-// K should inherit from WebFormControlElement as the function looks to extract
-// WebFormElement for K.form().
-template <class K, class V>
-void RemoveOldElements(const WebFrame& frame, std::map<const K, V>* states) {
-  std::vector<K> to_remove;
-  for (typename std::map<const K, V>::const_iterator it = states->begin();
-       it != states->end(); ++it) {
-    const WebFormElement& form_element = it->first.form();
-    if (form_element.isNull()) {
-      to_remove.push_back(it->first);
-    } else {
-      const WebFrame* element_frame = form_element.document().frame();
-      if (!element_frame || element_frame == &frame)
-        to_remove.push_back(it->first);
-    }
-  }
-
-  for (typename std::vector<K>::const_iterator it = to_remove.begin();
-       it != to_remove.end(); ++it) {
-    states->erase(*it);
-  }
-}
-
 void LogDeprecationMessages(const WebFormControlElement& element) {
   std::string autocomplete_attribute =
       base::UTF16ToUTF8(element.getAttribute("autocomplete"));
 
   static const char* const deprecated[] = { "region", "locality" };
   for (size_t i = 0; i < arraysize(deprecated); ++i) {
     if (autocomplete_attribute.find(deprecated[i]) == std::string::npos)
       continue;
     std::string msg = std::string("autocomplete='") + deprecated[i] +
         "' is deprecated and will soon be ignored. See http://goo.gl/YjeSsW";
@@ skipping 24 matching lines @@
 // allowable fields.  The corresponding maximum number of allowable fields
 // is imposed by WebFormElementToFormData().
 bool ShouldIgnoreForm(size_t num_editable_elements,
                       size_t num_control_elements) {
   return (num_editable_elements < kRequiredAutofillFields &&
           num_control_elements > 0);
 }
 
 }  // namespace
 
-FormCache::FormCache() {
+FormCache::FormCache(const WebFrame& frame) : frame_(frame) {
 }
 
 FormCache::~FormCache() {
 }
 
 // static
 std::vector<WebFormControlElement>
 FormCache::GetUnownedAutofillableFormFieldElements(
     const WebElementCollection& elements,
     std::vector<WebElement>* fieldsets) {
   std::vector<WebFormControlElement> unowned_fieldset_children;
   for (WebElement element = elements.firstItem();
        !element.isNull();
        element = elements.nextItem()) {
     if (element.isFormControlElement()) {
       WebFormControlElement control = element.to<WebFormControlElement>();
       if (control.form().isNull())
         unowned_fieldset_children.push_back(control);
     }
 
     if (fieldsets && element.hasHTMLTagName("fieldset") &&
         !IsElementInsideFormOrFieldSet(element)) {
       fieldsets->push_back(element);
     }
   }
   return ExtractAutofillableElementsFromSet(unowned_fieldset_children,
                                             REQUIRE_NONE);
 }
 
-std::vector<FormData> FormCache::ExtractNewForms(const WebFrame& frame) {
+std::vector<FormData> FormCache::ExtractNewForms() {
   std::vector<FormData> forms;
-  WebDocument document = frame.document();
+  WebDocument document = frame_.document();
   if (document.isNull())
     return forms;
 
-  if (!ContainsKey(documents_to_synthetic_form_map_, document))
-    documents_to_synthetic_form_map_[document] = FormData();
-
   WebVector<WebFormElement> web_forms;
   document.forms(web_forms);
 
   // Log an error message for deprecated attributes, but only the first time
   // the form is parsed.
-  bool log_deprecation_messages = !ContainsKey(parsed_forms_, &frame);
+  bool log_deprecation_messages = parsed_forms_.empty();
 
   const ExtractMask extract_mask =
       static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTIONS);
 
   size_t num_fields_seen = 0;
   for (size_t i = 0; i < web_forms.size(); ++i) {
     const WebFormElement& form_element = web_forms[i];
 
     std::vector<WebFormControlElement> control_elements =
         ExtractAutofillableElementsInForm(form_element, REQUIRE_NONE);
     size_t num_editable_elements =
         ScanFormControlElements(control_elements, log_deprecation_messages);
 
     if (ShouldIgnoreForm(num_editable_elements, control_elements.size()))
       continue;
 
     FormData form;
     if (!WebFormElementToFormData(form_element, WebFormControlElement(),
                                   REQUIRE_NONE, extract_mask, &form, NULL)) {
       continue;
     }
 
     num_fields_seen += form.fields.size();
     if (num_fields_seen > kMaxParseableFields)
       return forms;
 
     if (form.fields.size() >= kRequiredAutofillFields &&
-        !ContainsKey(parsed_forms_[&frame], form)) {
+        !ContainsKey(parsed_forms_, form)) {
       forms.push_back(form);
-      parsed_forms_[&frame].insert(form);
+      parsed_forms_.insert(form);
     }
   }
 
   // Look for more parseable fields outside of forms.
   std::vector<WebElement> fieldsets;
   std::vector<WebFormControlElement> control_elements =
       GetUnownedAutofillableFormFieldElements(document.all(), &fieldsets);
 
   size_t num_editable_elements =
       ScanFormControlElements(control_elements, log_deprecation_messages);
 
   if (ShouldIgnoreForm(num_editable_elements, control_elements.size()))
     return forms;
 
-  FormData form;
+  FormData synthetic_form;
   if (!UnownedFormElementsAndFieldSetsToFormData(fieldsets, control_elements,
                                                  document.url(), extract_mask,
-                                                 &form)) {
+                                                 &synthetic_form)) {
     return forms;
   }
 
-  num_fields_seen += form.fields.size();
+  num_fields_seen += synthetic_form.fields.size();
   if (num_fields_seen > kMaxParseableFields)
     return forms;
 
-  if (form.fields.size() >= kRequiredAutofillFields &&
-      !parsed_forms_[&frame].count(form)) {
-    forms.push_back(form);
-    parsed_forms_[&frame].insert(form);
-    documents_to_synthetic_form_map_[document] = form;
+  if (synthetic_form.fields.size() >= kRequiredAutofillFields &&
+      !parsed_forms_.count(synthetic_form)) {
+    forms.push_back(synthetic_form);
+    parsed_forms_.insert(synthetic_form);
+    synthetic_form_ = synthetic_form;
   }
   return forms;
 }
 
-void FormCache::ResetFrame(const WebFrame& frame) {
-  std::vector<WebDocument> documents_to_delete;
-  for (const auto& it : documents_to_synthetic_form_map_) {
-    const WebFrame* document_frame = it.first.frame();
-    if (!document_frame || document_frame == &frame)
-      documents_to_delete.push_back(it.first);
-  }
-
-  for (const auto& it : documents_to_delete)
-    documents_to_synthetic_form_map_.erase(it);
-
-  parsed_forms_[&frame].clear();
-  RemoveOldElements(frame, &initial_select_values_);
-  RemoveOldElements(frame, &initial_checked_state_);
+void FormCache::Reset() {
+  synthetic_form_ = FormData();
+  parsed_forms_.clear();
+  initial_select_values_.clear();
+  initial_checked_state_.clear();
 }
 
 bool FormCache::ClearFormWithElement(const WebFormControlElement& element) {
   WebFormElement form_element = element.form();
   if (form_element.isNull())
     return false;
 
   std::vector<WebFormControlElement> control_elements =
       ExtractAutofillableElementsInForm(form_element, REQUIRE_NONE);
   for (size_t i = 0; i < control_elements.size(); ++i) {
@@ skipping 42 matching lines @@
   }
 
   return true;
 }
 
 bool FormCache::ShowPredictions(const FormDataPredictions& form) {
   DCHECK_EQ(form.data.fields.size(), form.fields.size());
 
   std::vector<WebFormControlElement> control_elements;
 
-  // First check the synthetic forms.
+  // First check the synthetic form.
   bool found_synthetic_form = false;
-  for (const auto& it : documents_to_synthetic_form_map_) {
-    const FormData& form_data = it.second;
-    if (!form_data.SameFormAs(form.data))
-      continue;
-
+  if (form.data.SameFormAs(synthetic_form_)) {
     found_synthetic_form = true;
-    WebDocument document = it.first;
+    WebDocument document = frame_.document();
     control_elements =
         GetUnownedAutofillableFormFieldElements(document.all(), nullptr);
-    break;
   }
 
   if (!found_synthetic_form) {
     // Find the real form by searching through the WebDocuments.
     bool found_form = false;
     WebFormElement form_element;
-    for (const auto& it : documents_to_synthetic_form_map_) {
-      WebVector<WebFormElement> web_forms;
-      it.first.forms(web_forms);
+    WebVector<WebFormElement> web_forms;
+    frame_.document().forms(web_forms);
 
-      for (size_t i = 0; i < web_forms.size(); ++i) {
-        form_element = web_forms[i];
-
-        // Note: matching on the form name here which is not guaranteed to be
-        // unique for the page, nor is it guaranteed to be non-empty.  Ideally,
-        // we would have a way to uniquely identify the form cross-process. For
-        // now, we'll check form name and form action for identity.
-        // Also note that WebString() == WebString(string16()) does not evaluate
-        // to |true| -- WebKit distinguishes between a "null" string (lhs) and
-        // an "empty" string (rhs). We don't want that distinction, so forcing
-        // to string16.
-        base::string16 element_name = GetFormIdentifier(form_element);
-        GURL action(form_element.document().completeURL(form_element.action()));
-        if (element_name == form.data.name && action == form.data.action) {
-          found_form = true;
-          control_elements =
-              ExtractAutofillableElementsInForm(form_element, REQUIRE_NONE);
-          break;
-        }
+    for (size_t i = 0; i < web_forms.size(); ++i) {
+      form_element = web_forms[i];
+      // Note: matching on the form name here which is not guaranteed to be
+      // unique for the page, nor is it guaranteed to be non-empty.  Ideally,
+      // we would have a way to uniquely identify the form cross-process. For
+      // now, we'll check form name and form action for identity.
+      // Also note that WebString() == WebString(string16()) does not evaluate
+      // to |true| -- WebKit distinguishes between a "null" string (lhs) and
+      // an "empty" string (rhs). We don't want that distinction, so forcing
+      // to string16.
+      base::string16 element_name = GetFormIdentifier(form_element);
+      GURL action(form_element.document().completeURL(form_element.action()));
+      if (element_name == form.data.name && action == form.data.action) {
+        found_form = true;
+        control_elements =
+            ExtractAutofillableElementsInForm(form_element, REQUIRE_NONE);
+        break;
       }
     }
 
     if (!found_form)
       return false;
   }
 
   if (control_elements.size() != form.fields.size()) {
     // Keep things simple.  Don't show predictions for forms that were modified
     // between page load and the server's response to our query.
@@ skipping 55 matching lines @@
             std::make_pair(input_element, input_element.isChecked()));
       } else {
         ++num_editable_elements;
       }
     }
   }
   return num_editable_elements;
 }
 
 }  // namespace autofill