Index: components/autofill/content/renderer/form_cache.h |
diff --git a/components/autofill/content/renderer/form_cache.h b/components/autofill/content/renderer/form_cache.h |
index ed7f654654c8140ab78225d8a945345831579880..1f97d073137874e028a4a6e7b00a99eaede33a75 100644 |
--- a/components/autofill/content/renderer/form_cache.h |
+++ b/components/autofill/content/renderer/form_cache.h |
@@ -31,10 +31,20 @@ |
FormCache(); |
~FormCache(); |
- // Scans the DOM in |frame| extracting and storing forms that have not been |
- // seen before. Fills |forms| with extracted forms. |
- void ExtractNewForms(const blink::WebFrame& frame, |
- std::vector<FormData>* forms); |
+ // Scans the DOM in |frame| extracting and storing forms. |
+ // Fills |forms| with extracted forms. |
+ void ExtractForms(const blink::WebFrame& frame, |
+ std::vector<FormData>* forms); |
+ |
+ // Scans the DOM in |frame| extracting and storing forms. |
+ // Fills |forms| with extracted forms and |web_form_elements| with associated |
+ // web form elements. Returns true if there are unextracted forms due to |
+ // |minimum_required_fields| limit, else false. |
+ bool ExtractFormsAndFormElements( |
+ const blink::WebFrame& frame, |
+ size_t minimum_required_fields, |
+ std::vector<FormData>* forms, |
+ std::vector<blink::WebFormElement>* web_form_elements); |
// Resets the forms for the specified |frame|. |
void ResetFrame(const blink::WebFrame& frame); |
@@ -53,9 +63,6 @@ |
// The cached web frames. |
std::set<blink::WebDocument> web_documents_; |
- // The cached forms per frame. Used to prevent re-extraction of forms. |
- std::map<const blink::WebFrame*, std::set<FormData> > parsed_forms_; |
- |
// The cached initial values for <select> elements. |
std::map<const blink::WebSelectElement, base::string16> |
initial_select_values_; |