Fix for a regression introduced by an autofill change

webkit/glue/editor_client_impl.h

 // 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.
 
 #ifndef WEBKIT_GLUE_EDITOR_CLIENT_IMPL_H__
 #define WEBKIT_GLUE_EDITOR_CLIENT_IMPL_H__
 
 #include <deque>
 
 #include "DOMWindow.h"
@@ skipping 97 matching lines @@
   virtual std::wstring DescribeOrError(int number,
                                        WebCore::ExceptionCode ec);
   virtual std::wstring DescribeOrError(WebCore::Node* node,
                                        WebCore::ExceptionCode ec);
   virtual std::wstring Describe(WebCore::Range* range);
   virtual std::wstring Describe(WebCore::Node* node);
   virtual std::wstring Describe(WebCore::EditorInsertAction action);
   virtual std::wstring Describe(WebCore::EAffinity affinity);
   virtual std::wstring Describe(WebCore::CSSStyleDeclaration* style);
 
-  // Shows the autofill popup for |node| if it is an HTMLInputElement and it is
-  // empty.  This is called when you press the up or down arrow in a text field
-  // or when clicking an already focused text-field.
+  // Shows the form autofill popup for |node| if it is an HTMLInputElement and
+  // it is empty.  This is called when you press the up or down arrow in a
+  // text-field or when clicking an already focused text-field.
   // Returns true if the autofill popup has been scheduled to be shown, false
   // otherwise.
-  virtual bool ShowAutofillForNode(WebCore::Node* node);
+  virtual bool ShowFormAutofillForNode(WebCore::Node* node);
 
  private:
   void ModifySelection(WebCore::Frame* frame,
                        WebCore::KeyboardEvent* event);
 
-  // Popups an autofill menu for |input_element| is applicable.
+  // Triggers autofill for |input_element| if applicable.  This can be form
+  // autofill (via a popup-menu) or password autofill depending on
+  // |input_element|.  If |form_autofill_only| is true, password autofill is not
+  // triggered.
   // |autofill_on_empty_value| indicates whether the autofill should be shown
   // when the text-field is empty.
   // If |requires_caret_at_end| is true, the autofill popup is only shown if the
   // caret is located at the end of the entered text in |input_element|.
   // Returns true if the autofill popup has been scheduled to be shown, false
   // otherwise.
   bool Autofill(WebCore::HTMLInputElement* input_element,
+                bool form_autofill_only,
                 bool autofill_on_empty_value,
                 bool requires_caret_at_end);
 
   // This method is invoked later by Autofill() as when Autofill() is invoked
   // (from one of the EditorClient callback) the carret position is not
   // reflecting the last text change yet and we need it to decide whether or not
   // to show the autofill popup.
   void DoAutofill(WebCore::HTMLInputElement* input_element,
+                  bool form_autofill_only,
                   bool autofill_on_empty_value,
                   bool requires_caret_at_end,
                   bool backspace);
 
  protected:
   WebViewImpl* web_view_;
   bool use_editor_delegate_;
   bool in_redo_;
 
   typedef std::deque<WTF::RefPtr<WebCore::EditCommand> > EditCommandStack;
@@ skipping 20 matching lines @@
     SPELLCHECK_FORCED_ON,
     SPELLCHECK_FORCED_OFF
   };
   int spell_check_this_field_status_;
 
   // The method factory used to post autofill related tasks.
   ScopedRunnableMethodFactory<EditorClientImpl> autofill_factory_;
 };
 
 #endif  // WEBKIT_GLUE_EDITOR_CLIENT_IMPL_H__