New take at implementing autofill using the editor client API

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 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 "config.h"
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 26 matching lines @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #if defined(OS_WIN)
 #include "webkit/activex_shim/activex_shared.h"
 #endif
 #include "webkit/glue/autofill_form.h"
 #include "webkit/glue/alt_404_page_resource_fetcher.h"
-#include "webkit/glue/autocomplete_input_listener.h"
-#include "webkit/glue/form_autocomplete_listener.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webdocumentloader_impl.h"
 #include "webkit/glue/weberror_impl.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 #include "webkit/glue/webhistoryitem_impl.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 262 matching lines @@
   WebViewImpl* webview = webframe_->webview_impl();
   if (webview && webview->delegate()) {
     webview->delegate()->DidFailLoadingWithError(webview, identifier,
                                                  WebErrorImpl(error));
   }
 }
 
 void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
   WebViewImpl* webview = webframe_->webview_impl();
   WebViewDelegate* d = webview->delegate();
-  // A frame may be reused.  This call ensures a new AutoCompleteListener will
-  // be created for the newly created frame.
-  webframe_->ClearAutocompleteListener();
+
+  // A frame may be reused.  This call ensures we don't hold on to our password
+  // listeners and their associated HTMLInputElements.
+  webframe_->ClearPasswordListeners();
 
   // The document has now been fully loaded.
   // Scan for password forms to be sent to the browser
   PassRefPtr<WebCore::HTMLCollection> forms =
       webframe_->frame()->document()->forms();
 
   std::vector<PasswordForm> passwordForms;
 
   unsigned int form_count = forms->length();
   for (unsigned int i = 0; i < form_count; ++i) {
     // Strange but true, sometimes item can be NULL.
     WebCore::Node* item = forms->item(i);
     if (item) {
       WebCore::HTMLFormElement* form =
           static_cast<WebCore::HTMLFormElement*>(item);
 
       // Honour autocomplete=off.
       if (!form->autoComplete())
         continue;
 
-      std::set<std::wstring> password_related_fields;
       scoped_ptr<PasswordForm> passwordFormPtr(
           PasswordFormDomManager::CreatePasswordForm(form));
 
-      if (passwordFormPtr.get()) {
+      if (passwordFormPtr.get())
         passwordForms.push_back(*passwordFormPtr);
-
-        // Let's remember the names of password related fields so we do not
-        // autofill them with the regular form autofill.
-
-        if (!passwordFormPtr->username_element.empty())
-          password_related_fields.insert(passwordFormPtr->username_element);
-        DCHECK(!passwordFormPtr->password_element.empty());
-        password_related_fields.insert(passwordFormPtr->password_element);
-        if (!passwordFormPtr->old_password_element.empty())
-          password_related_fields.insert(passwordFormPtr->old_password_element);
-      }
-
-      // Now let's register for any text input.
-      // TODO(jcampan): bug #3847 merge password and form autofill so we
-      // traverse the form elements only once.
-      RegisterAutofillListeners(form, password_related_fields);
     }
   }
 
   if (d && (passwordForms.size() > 0))
     d->OnPasswordFormsSeen(webview, passwordForms);
   if (d)
     d->DidFinishDocumentLoadForFrame(webview, webframe_);
 }
 
 bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(
@@ skipping 310 matching lines @@
 NavigationGesture WebFrameLoaderClient::NavigationGestureForLastLoad() {
   // TODO(timsteele): userGestureHint returns too many false positives
   // (see bug 1051891) to trust it and assign NavigationGestureUser, so
   // for now we assign Unknown in those cases and Auto otherwise.
   // (Issue 874811 known false negative as well).
   return webframe_->frame()->loader()->userGestureHint() ?
       NavigationGestureUnknown :
       NavigationGestureAuto;
 }
 
-void WebFrameLoaderClient::RegisterAutofillListeners(
-    WebCore::HTMLFormElement* form,
-    const std::set<std::wstring>& excluded_fields) {
-
-  WebViewDelegate* webview_delegate = webframe_->webview_impl()->delegate();
-  if (!webview_delegate)
-    return;
-
-  for (size_t i = 0; i < form->formElements.size(); i++) {
-    WebCore::HTMLFormControlElement* form_element = form->formElements[i];
-    if (!form_element->hasLocalName(WebCore::HTMLNames::inputTag))
-      continue;
-
-    WebCore::HTMLInputElement* input_element =
-        static_cast<WebCore::HTMLInputElement*>(form_element);
-    if (!input_element->isEnabled() || !input_element->isTextField() ||
-        input_element->isPasswordField() || !input_element->autoComplete()) {
-      continue;
-    }
-
-    std::wstring name = webkit_glue::StringToStdWString(input_element->name());
-    if (name.empty() || excluded_fields.find(name) != excluded_fields.end())
-      continue;
-
-#if !defined(OS_MACOSX)
-    // FIXME on Mac
-    webkit_glue::FormAutocompleteListener* listener =
-        new webkit_glue::FormAutocompleteListener(webview_delegate);
-    webframe_->GetAutocompleteListener()->AddInputListener(input_element,
-                                                           listener);
-#endif
-  }
-}
-
 void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title) {
   WebViewImpl* webview = webframe_->webview_impl();
   WebViewDelegate* d = webview->delegate();
   if (d) {
     d->DidReceiveTitle(webview, webkit_glue::StringToStdWString(title),
                        webframe_);
   }
 }
 
 void WebFrameLoaderClient::dispatchDidCommitLoad() {
@@ skipping 244 matching lines @@
 }
 
 void WebFrameLoaderClient::dispatchUnableToImplementPolicy(const ResourceError&) {
   // FIXME
 }
 
 void WebFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction function,
     PassRefPtr<FormState> form_ref) {
   SearchableFormData* form_data = SearchableFormData::Create(form_ref->form());
   WebDocumentLoaderImpl* loader = static_cast<WebDocumentLoaderImpl*>(
-    webframe_->frame()->loader()->provisionalDocumentLoader());
+      webframe_->frame()->loader()->provisionalDocumentLoader());
   // Don't free the SearchableFormData, the loader will do that.
   loader->set_searchable_form_data(form_data);
 
   PasswordForm* pass_data =
       PasswordFormDomManager::CreatePasswordForm(form_ref->form());
   // Don't free the PasswordFormData, the loader will do that.
   loader->set_password_form_data(pass_data);
 
   WebViewImpl* webview = webframe_->webview_impl();
   WebViewDelegate* d = webview->delegate();
@@ skipping 515 matching lines @@
   if (!middle_or_ctrl && !shift && !alt)
     return false;
 
   DCHECK(disposition);
   if (middle_or_ctrl)
     *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   else
     *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK;
   return true;
 }