Fix for a regression introduced by an autofill change

webkit/glue/editor_client_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.
 
 // The Mac interface forwards most of these commands to the application layer,
 // and I'm not really sure what to do about most of them.
 
 #include "config.h"
 #include "webkit/glue/editor_client_impl.h"
 
@@ skipping 616 matching lines @@
 }
 
 //
 // End of code block subject to Apple, Inc. copyright
 //
 
 void EditorClientImpl::handleKeyboardEvent(WebCore::KeyboardEvent* evt) {
   if (evt->keyCode() == WebCore::VKEY_DOWN ||
       evt->keyCode() == WebCore::VKEY_UP) {
     DCHECK(evt->target()->toNode());
-    ShowAutofillForNode(evt->target()->toNode());
+    ShowFormAutofillForNode(evt->target()->toNode());
   }
 
   if (handleEditingKeyboardEvent(evt))
     evt->setDefaultHandled();
 }
 
 void EditorClientImpl::handleInputMethodKeydown(WebCore::KeyboardEvent* keyEvent) {
   // We handle IME within chrome.
 }
 
 void EditorClientImpl::textFieldDidBeginEditing(WebCore::Element*) {
 }
 
 void EditorClientImpl::textFieldDidEndEditing(WebCore::Element*) {
   // Notification that focus was lost.  Be careful with this, it's also sent
   // when the page is being closed.
 
   // Cancel any pending DoAutofill calls.
   autofill_factory_.RevokeAll();
 
   // Hide any showing popup.
   web_view_->HideAutoCompletePopup();
 }
 
 void EditorClientImpl::textDidChangeInTextField(WebCore::Element* element) {
   DCHECK(element->hasLocalName(WebCore::HTMLNames::inputTag));
   // Note that we only show the autofill popup in this case if the caret is at
   // the end.  This matches FireFox and Safari but not IE.
-  Autofill(static_cast<WebCore::HTMLInputElement*>(element), false, true);
+  Autofill(static_cast<WebCore::HTMLInputElement*>(element),
+           false, false, true);
 }
 
-bool EditorClientImpl::ShowAutofillForNode(WebCore::Node* node) {
+bool EditorClientImpl::ShowFormAutofillForNode(WebCore::Node* node) {
   WebCore::HTMLInputElement* input_element =
       webkit_glue::NodeToHTMLInputElement(node);
   if (input_element)
-    return Autofill(input_element, true, false);
+    return Autofill(input_element, true, true, false);
   return false;
 }
 
 bool EditorClientImpl::Autofill(WebCore::HTMLInputElement* input_element,
+                                bool form_autofill_only,
                                 bool autofill_on_empty_value,
                                 bool requires_caret_at_end) {
   // Cancel any pending DoAutofill calls.
   autofill_factory_.RevokeAll();
 
   // Let's try to trigger autofill for that field, if applicable.
   if (!input_element->isEnabled() || !input_element->isTextField() ||
       input_element->isPasswordField() || !input_element->autoComplete()) {
     return false;
   }
 
   std::wstring name = AutofillForm::GetNameForInputElement(input_element);
   if (name.empty())  // If the field has no name, then we won't have values.
     return false;
 
   // Don't attempt to autofill with values that are too large.
   if (input_element->value().length() > kMaximumTextSizeForAutofill)
     return false;
 
   if (!requires_caret_at_end) {
-    DoAutofill(input_element, autofill_on_empty_value,
+    DoAutofill(input_element, form_autofill_only, autofill_on_empty_value,
                false, backspace_pressed_);
   } else {
     // We post a task for doing the autofill as the caret position is not set
     // properly at this point (http://bugs.webkit.org/show_bug.cgi?id=16976) and
     // we need it to determine whether or not to trigger autofill.
     std::wstring value =
         webkit_glue::StringToStdWString(input_element->value());
     MessageLoop::current()->PostTask(
         FROM_HERE,
         autofill_factory_.NewRunnableMethod(&EditorClientImpl::DoAutofill,
                                             input_element,
+                                            form_autofill_only,
                                             autofill_on_empty_value,
                                             true,
                                             backspace_pressed_));
   }
   return true;
 }
 
 void EditorClientImpl::DoAutofill(WebCore::HTMLInputElement* input_element,
+                                  bool form_autofill_only,
                                   bool autofill_on_empty_value,
                                   bool requires_caret_at_end,
                                   bool backspace) {
   std::wstring value = webkit_glue::StringToStdWString(input_element->value());
 
   // Enforce autofill_on_empty_value and caret_at_end.
   bool is_caret_at_end = requires_caret_at_end ?
         input_element->selectionStart() == input_element->selectionEnd() &&
         input_element->selectionEnd() == static_cast<int>(value.length()) :
         true;  // When |requires_caret_at_end| is false, just pretend we are at
                // the end.
   if ((!autofill_on_empty_value && value.empty()) || !is_caret_at_end) {
     web_view_->HideAutoCompletePopup();
     return;
   }
 
   // First let's see if there is a password listener for that element.
+  // We won't trigger form autofill in that case, as having both behavior on
+  // a node would be confusing.
   WebFrameImpl* webframe =
       WebFrameImpl::FromFrame(input_element->document()->frame());
   webkit_glue::PasswordAutocompleteListener* listener =
       webframe->GetPasswordListener(input_element);
   if (listener) {
+    if (form_autofill_only)
+      return;
+
     if (backspace)  // No autocomplete for password on backspace.
       return;
 
     listener->OnInlineAutocompleteNeeded(input_element, value);
     return;
   }
 
   // Then trigger form autofill.
   std::wstring name = AutofillForm::GetNameForInputElement(input_element);
   DCHECK_GT(static_cast<int>(name.length()), 0);
@@ skipping 170 matching lines @@
   }
   return L"(UNKNOWN AFFINITY)";
 }
 
 std::wstring EditorClientImpl::Describe(WebCore::CSSStyleDeclaration* style) {
   // TODO(pamg): Implement me.  It's not clear what WebKit produces for this
   // (their [style description] method), and none of the layout tests provide
   // an example.  But because none of them use it, it's not yet important.
   return std::wstring();
 }