Fix password mgr heuristics for sites that keep the login form around after signin

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2658 matching lines @@
   DCHECK(navigation_state);
   navigation_state->set_finish_document_load_time(Time::Now());
 
   Send(new ViewHostMsg_DocumentLoadedInFrame(routing_id_));
 
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
   // TODO(jhawkins): Make these use the FormManager.
   form_manager_.ExtractForms(frame);
   SendForms(frame);
-  SendPasswordForms(frame);
+  SendPasswordForms(frame, false);
 
   // Check whether we have new encoding name.
   UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
 
   if (RenderThread::current()) {  // Will be NULL during unit tests.
     RenderThread::current()->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_END);
   }
 
   navigation_state->user_script_idle_scheduler()->DidFinishDocumentLoad();
@@ skipping 23 matching lines @@
 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) {
   // Ignore
 }
 
 void RenderView::didFinishLoad(WebFrame* frame) {
   WebDataSource* ds = frame->dataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   DCHECK(navigation_state);
   navigation_state->set_finish_load_time(Time::Now());
   navigation_state->user_script_idle_scheduler()->DidFinishLoad();
+
+  // Let the password manager know which password forms are actually visible.
+  SendPasswordForms(frame, true);
 }
 
 void RenderView::didNavigateWithinPage(
     WebFrame* frame, bool is_new_navigation) {
 
   // Determine if the UserScriptIdleScheduler already ran scripts on this page,
   // since a new one gets created by didCreateDataSource.
   NavigationState* state =
     NavigationState::FromDataSource(frame->dataSource());
   bool idle_scheduler_ran = state->user_script_idle_scheduler()->has_run();
@@ skipping 1969 matching lines @@
   if (acc_obj_id >= 0)
     Send(new ViewHostMsg_AccessibilityObjectStateChange(routing_id_,
                                                         acc_obj_id));
 
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
-void RenderView::SendPasswordForms(WebFrame* frame) {
+void RenderView::SendPasswordForms(WebFrame* frame, bool only_visible) {
   WebVector<WebFormElement> forms;
   frame->forms(forms);
 
   std::vector<PasswordForm> password_forms;
   for (size_t i = 0; i < forms.size(); ++i) {
     const WebFormElement& form = forms[i];
 
     // Respect autocomplete=off.
-    if (form.autoComplete()) {
-      scoped_ptr<PasswordForm> password_form(
-          PasswordFormDomManager::CreatePasswordForm(form));
-      if (password_form.get())
-        password_forms.push_back(*password_form);
-    }
+    if (!form.autoComplete())
+      continue;
+    if (only_visible && !form.hasNonEmptyBoundingBox())
+      continue;
+    scoped_ptr<PasswordForm> password_form(
+        PasswordFormDomManager::CreatePasswordForm(form));
+    if (password_form.get())
+      password_forms.push_back(*password_form);
   }
 
-  if (!password_forms.empty())
-    Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
+  if (password_forms.empty())
+    return;
+  if (only_visible)
+    Send(new ViewHostMsg_PasswordFormsVisible(routing_id_, password_forms));
+  else
+    Send(new ViewHostMsg_PasswordFormsFound(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }
 
@@ skipping 222 matching lines @@
 
     if (last_top_level_navigation_page_id_ != page_id_ &&
         // Not interested in reloads.
         type != WebKit::WebNavigationTypeReload &&
         type != WebKit::WebNavigationTypeFormSubmitted) {
       return true;
     }
   }
   return false;
 }