Rename AutoFill -> Autofill and autoFill -> autofill
authorisherman@chromium.org <isherman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jul 2011 16:42:50 +0000 (16:42 +0000)
committerisherman@chromium.org <isherman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jul 2011 16:42:50 +0000 (16:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=64333
http://code.google.com/p/chromium/issues/detail?id=72758

Reviewed by Darin Fisher.

* WebKit.gyp:
* public/WebAutofillClient.h:
(WebKit::WebAutofillClient::didAcceptAutofillSuggestion):
(WebKit::WebAutofillClient::didSelectAutofillSuggestion):
(WebKit::WebAutofillClient::didClearAutofillSelection):
(WebKit::WebAutofillClient::removeAutocompleteSuggestion):
(WebKit::WebAutofillClient::textFieldDidBeginEditing):
(WebKit::WebAutofillClient::textFieldDidEndEditing):
(WebKit::WebAutofillClient::textFieldDidChange):
(WebKit::WebAutofillClient::textFieldDidReceiveKeyDown):
(WebKit::WebAutofillClient::~WebAutofillClient):
* public/WebNode.h:
* public/WebView.h:
* src/AutofillPopupMenuClient.cpp:
(WebKit::AutofillPopupMenuClient::AutofillPopupMenuClient):
(WebKit::AutofillPopupMenuClient::~AutofillPopupMenuClient):
(WebKit::AutofillPopupMenuClient::getSuggestionsCount):
(WebKit::AutofillPopupMenuClient::getSuggestion):
(WebKit::AutofillPopupMenuClient::getLabel):
(WebKit::AutofillPopupMenuClient::getIcon):
(WebKit::AutofillPopupMenuClient::removeSuggestionAtIndex):
(WebKit::AutofillPopupMenuClient::canRemoveSuggestionAtIndex):
(WebKit::AutofillPopupMenuClient::valueChanged):
(WebKit::AutofillPopupMenuClient::selectionChanged):
(WebKit::AutofillPopupMenuClient::selectionCleared):
(WebKit::AutofillPopupMenuClient::itemText):
(WebKit::AutofillPopupMenuClient::itemLabel):
(WebKit::AutofillPopupMenuClient::itemIcon):
(WebKit::AutofillPopupMenuClient::itemIsEnabled):
(WebKit::AutofillPopupMenuClient::itemStyle):
(WebKit::AutofillPopupMenuClient::menuStyle):
(WebKit::AutofillPopupMenuClient::clientPaddingLeft):
(WebKit::AutofillPopupMenuClient::clientPaddingRight):
(WebKit::AutofillPopupMenuClient::popupDidHide):
(WebKit::AutofillPopupMenuClient::itemIsSeparator):
(WebKit::AutofillPopupMenuClient::itemIsWarning):
(WebKit::AutofillPopupMenuClient::setTextFromItem):
(WebKit::AutofillPopupMenuClient::fontSelector):
(WebKit::AutofillPopupMenuClient::hostWindow):
(WebKit::AutofillPopupMenuClient::createScrollbar):
(WebKit::AutofillPopupMenuClient::initialize):
(WebKit::AutofillPopupMenuClient::setSuggestions):
(WebKit::AutofillPopupMenuClient::convertListIndexToInternalIndex):
(WebKit::AutofillPopupMenuClient::getWebView):
(WebKit::AutofillPopupMenuClient::textFieldStyle):
* src/AutofillPopupMenuClient.h:
(WebKit::AutofillPopupMenuClient::itemToolTip):
(WebKit::AutofillPopupMenuClient::itemAccessibilityText):
(WebKit::AutofillPopupMenuClient::clientInsetLeft):
(WebKit::AutofillPopupMenuClient::clientInsetRight):
(WebKit::AutofillPopupMenuClient::listSize):
(WebKit::AutofillPopupMenuClient::selectedIndex):
(WebKit::AutofillPopupMenuClient::itemIsLabel):
(WebKit::AutofillPopupMenuClient::itemIsSelected):
(WebKit::AutofillPopupMenuClient::shouldPopOver):
(WebKit::AutofillPopupMenuClient::valueShouldChangeOnHotTrack):
(WebKit::AutofillPopupMenuClient::getTextField):
(WebKit::AutofillPopupMenuClient::getSelectedIndex):
(WebKit::AutofillPopupMenuClient::setSelectedIndex):
* src/EditorClientImpl.cpp:
(WebKit::EditorClientImpl::textFieldDidBeginEditing):
(WebKit::EditorClientImpl::textFieldDidEndEditing):
(WebKit::EditorClientImpl::textDidChangeInTextField):
(WebKit::EditorClientImpl::doAutofill):
(WebKit::EditorClientImpl::doTextFieldCommandFromEvent):
* src/WebInputElement.cpp:
(WebKit::WebInputElement::setAutofilled):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setAutofillClient):
(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::mouseDown):
(WebKit::WebViewImpl::autocompleteHandleKeyEvent):
(WebKit::WebViewImpl::hideAutofillPopup):
(WebKit::WebViewImpl::setFocus):
(WebKit::WebViewImpl::applyAutofillSuggestions):
(WebKit::WebViewImpl::hidePopups):
(WebKit::WebViewImpl::refreshAutofillPopup):
* src/WebViewImpl.h:
(WebKit::WebViewImpl::autofillClient):
(WebKit::WebViewImpl::autofillPopupDidHide):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91004 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/public/WebAutofillClient.h [moved from Source/WebKit/chromium/public/WebAutoFillClient.h with 86% similarity]
Source/WebKit/chromium/public/WebNode.h
Source/WebKit/chromium/public/WebView.h
Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp [moved from Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp with 81% similarity]
Source/WebKit/chromium/src/AutofillPopupMenuClient.h [moved from Source/WebKit/chromium/src/AutoFillPopupMenuClient.h with 95% similarity]
Source/WebKit/chromium/src/EditorClientImpl.cpp
Source/WebKit/chromium/src/WebInputElement.cpp
Source/WebKit/chromium/src/WebViewImpl.cpp
Source/WebKit/chromium/src/WebViewImpl.h

index 672428fa402c3ccaf63e254432d4ade32632f09a..f843ed89dbcb0b4858e04078711b00de88209c57 100644 (file)
@@ -1,3 +1,92 @@
+2011-07-14  Ilya Sherman  <isherman@chromium.org>
+
+        Rename AutoFill -> Autofill and autoFill -> autofill
+        https://bugs.webkit.org/show_bug.cgi?id=64333
+        http://code.google.com/p/chromium/issues/detail?id=72758
+
+        Reviewed by Darin Fisher.
+
+        * WebKit.gyp:
+        * public/WebAutofillClient.h:
+        (WebKit::WebAutofillClient::didAcceptAutofillSuggestion):
+        (WebKit::WebAutofillClient::didSelectAutofillSuggestion):
+        (WebKit::WebAutofillClient::didClearAutofillSelection):
+        (WebKit::WebAutofillClient::removeAutocompleteSuggestion):
+        (WebKit::WebAutofillClient::textFieldDidBeginEditing):
+        (WebKit::WebAutofillClient::textFieldDidEndEditing):
+        (WebKit::WebAutofillClient::textFieldDidChange):
+        (WebKit::WebAutofillClient::textFieldDidReceiveKeyDown):
+        (WebKit::WebAutofillClient::~WebAutofillClient):
+        * public/WebNode.h:
+        * public/WebView.h:
+        * src/AutofillPopupMenuClient.cpp:
+        (WebKit::AutofillPopupMenuClient::AutofillPopupMenuClient):
+        (WebKit::AutofillPopupMenuClient::~AutofillPopupMenuClient):
+        (WebKit::AutofillPopupMenuClient::getSuggestionsCount):
+        (WebKit::AutofillPopupMenuClient::getSuggestion):
+        (WebKit::AutofillPopupMenuClient::getLabel):
+        (WebKit::AutofillPopupMenuClient::getIcon):
+        (WebKit::AutofillPopupMenuClient::removeSuggestionAtIndex):
+        (WebKit::AutofillPopupMenuClient::canRemoveSuggestionAtIndex):
+        (WebKit::AutofillPopupMenuClient::valueChanged):
+        (WebKit::AutofillPopupMenuClient::selectionChanged):
+        (WebKit::AutofillPopupMenuClient::selectionCleared):
+        (WebKit::AutofillPopupMenuClient::itemText):
+        (WebKit::AutofillPopupMenuClient::itemLabel):
+        (WebKit::AutofillPopupMenuClient::itemIcon):
+        (WebKit::AutofillPopupMenuClient::itemIsEnabled):
+        (WebKit::AutofillPopupMenuClient::itemStyle):
+        (WebKit::AutofillPopupMenuClient::menuStyle):
+        (WebKit::AutofillPopupMenuClient::clientPaddingLeft):
+        (WebKit::AutofillPopupMenuClient::clientPaddingRight):
+        (WebKit::AutofillPopupMenuClient::popupDidHide):
+        (WebKit::AutofillPopupMenuClient::itemIsSeparator):
+        (WebKit::AutofillPopupMenuClient::itemIsWarning):
+        (WebKit::AutofillPopupMenuClient::setTextFromItem):
+        (WebKit::AutofillPopupMenuClient::fontSelector):
+        (WebKit::AutofillPopupMenuClient::hostWindow):
+        (WebKit::AutofillPopupMenuClient::createScrollbar):
+        (WebKit::AutofillPopupMenuClient::initialize):
+        (WebKit::AutofillPopupMenuClient::setSuggestions):
+        (WebKit::AutofillPopupMenuClient::convertListIndexToInternalIndex):
+        (WebKit::AutofillPopupMenuClient::getWebView):
+        (WebKit::AutofillPopupMenuClient::textFieldStyle):
+        * src/AutofillPopupMenuClient.h:
+        (WebKit::AutofillPopupMenuClient::itemToolTip):
+        (WebKit::AutofillPopupMenuClient::itemAccessibilityText):
+        (WebKit::AutofillPopupMenuClient::clientInsetLeft):
+        (WebKit::AutofillPopupMenuClient::clientInsetRight):
+        (WebKit::AutofillPopupMenuClient::listSize):
+        (WebKit::AutofillPopupMenuClient::selectedIndex):
+        (WebKit::AutofillPopupMenuClient::itemIsLabel):
+        (WebKit::AutofillPopupMenuClient::itemIsSelected):
+        (WebKit::AutofillPopupMenuClient::shouldPopOver):
+        (WebKit::AutofillPopupMenuClient::valueShouldChangeOnHotTrack):
+        (WebKit::AutofillPopupMenuClient::getTextField):
+        (WebKit::AutofillPopupMenuClient::getSelectedIndex):
+        (WebKit::AutofillPopupMenuClient::setSelectedIndex):
+        * src/EditorClientImpl.cpp:
+        (WebKit::EditorClientImpl::textFieldDidBeginEditing):
+        (WebKit::EditorClientImpl::textFieldDidEndEditing):
+        (WebKit::EditorClientImpl::textDidChangeInTextField):
+        (WebKit::EditorClientImpl::doAutofill):
+        (WebKit::EditorClientImpl::doTextFieldCommandFromEvent):
+        * src/WebInputElement.cpp:
+        (WebKit::WebInputElement::setAutofilled):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setAutofillClient):
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit::WebViewImpl::mouseDown):
+        (WebKit::WebViewImpl::autocompleteHandleKeyEvent):
+        (WebKit::WebViewImpl::hideAutofillPopup):
+        (WebKit::WebViewImpl::setFocus):
+        (WebKit::WebViewImpl::applyAutofillSuggestions):
+        (WebKit::WebViewImpl::hidePopups):
+        (WebKit::WebViewImpl::refreshAutofillPopup):
+        * src/WebViewImpl.h:
+        (WebKit::WebViewImpl::autofillClient):
+        (WebKit::WebViewImpl::autofillPopupDidHide):
+
 2011-07-14  Yury Semikhatsky  <yurys@chromium.org>
 
         [Chromium] Web Inspector: URL parameters should consistently use camel case names
index 11f3ed2b3bf78878d98c40192001102e8bdfe22d..3a7f16aadf9bc8052b533a0825791212227057f8 100644 (file)
                 'public/WebAttribute.h',
                 'public/WebAudioBus.h',
                 'public/WebAudioDevice.h',
-                'public/WebAutoFillClient.h',
+                'public/WebAutofillClient.h',
                 'public/WebBindings.h',
                 'public/WebBlobData.h',
                 'public/WebBlobRegistry.h',
                 'src/AsyncFileWriterChromium.h',
                 'src/AudioDestinationChromium.cpp',
                 'src/AudioDestinationChromium.h',
-                'src/AutoFillPopupMenuClient.cpp',
-                'src/AutoFillPopupMenuClient.h',
+                'src/AutofillPopupMenuClient.cpp',
+                'src/AutofillPopupMenuClient.h',
                 'src/BackForwardListChromium.cpp',
                 'src/BackForwardListChromium.h',
                 'src/BlobRegistryProxy.cpp',
similarity index 86%
rename from Source/WebKit/chromium/public/WebAutoFillClient.h
rename to Source/WebKit/chromium/public/WebAutofillClient.h
index 63b39a86ee55b60f6646a204849f8d2d01fcfd9d..1eb7cb6f5fb8a8a9721d9e558a0734191ad6a47e 100644 (file)
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebAutoFillClient_h
-#define WebAutoFillClient_h
+#ifndef WebAutofillClient_h
+#define WebAutofillClient_h
 
 namespace WebKit {
 
@@ -38,32 +38,32 @@ class WebKeyboardEvent;
 class WebNode;
 class WebString;
 
-class WebAutoFillClient {
+class WebAutofillClient {
 public:
-    // Informs the browser that the user has accepted an AutoFill suggestion for
-    // a WebNode.  |uniqueID| is used as a key into the set of AutoFill profiles,
+    // Informs the browser that the user has accepted an Autofill suggestion for
+    // a WebNode.  |uniqueID| is used as a key into the set of Autofill profiles,
     // and should never be negative.  If it is 0, then the suggestion is an
     // Autocomplete suggestion; and |value| stores the suggested text.  |index|
     // is an index of the selected suggestion in the list of suggestions provided
     // by the client.
-    virtual void didAcceptAutoFillSuggestion(const WebNode&,
+    virtual void didAcceptAutofillSuggestion(const WebNode&,
                                              const WebString& value,
                                              const WebString& label,
                                              int uniqueID,
                                              unsigned index) { }
 
-    // Informs the browser that the user has selected an AutoFill suggestion for
+    // Informs the browser that the user has selected an Autofill suggestion for
     // a WebNode.  This happens when the user hovers over a suggestion or uses
     // the arrow keys to navigate to a suggestion.
-    virtual void didSelectAutoFillSuggestion(const WebNode&,
+    virtual void didSelectAutofillSuggestion(const WebNode&,
                                              const WebString& name,
                                              const WebString& label,
                                              int uniqueID) { }
 
     // Informs the browser that the user has cleared the selection from the
-    // AutoFill suggestions popup.  This happens when a user uses the arrow
+    // Autofill suggestions popup. This happens when a user uses the arrow
     // keys to navigate outside the range of possible selections.
-    virtual void didClearAutoFillSelection(const WebNode&) { }
+    virtual void didClearAutofillSelection(const WebNode&) { }
 
     // Instructs the browser to remove the Autocomplete entry specified from
     // its DB.
@@ -77,7 +77,7 @@ public:
     virtual void textFieldDidReceiveKeyDown(const WebInputElement&, const WebKeyboardEvent&) { }
 
 protected:
-    ~WebAutoFillClient() { }
+    ~WebAutofillClient() { }
 };
 
 } // namespace WebKit
index c6baa12b38b71264e98af064698505255c7799fa..ed80b7d591bcac2503b0b841c5865b1b5efecae6 100644 (file)
@@ -35,6 +35,9 @@
 #include "WebPrivatePtr.h"
 #include "WebString.h"
 
+// TODO(isherman): Remove this once the Chromium side is updated.
+#define CRBUG_72758_FIXED
+
 namespace WebCore { class Node; }
 
 namespace WebKit {
index 4a3ab5839268b61183011f2d1d87bc1a1c349c2a..9148d703baf9dd8a4f048a66b369e201e5ed292c 100644 (file)
@@ -40,7 +40,7 @@
 namespace WebKit {
 
 class WebAccessibilityObject;
-class WebAutoFillClient;
+class WebAutofillClient;
 class WebDevToolsAgent;
 class WebDevToolsAgentClient;
 class WebDragData;
@@ -95,7 +95,7 @@ public:
     virtual void initializeMainFrame(WebFrameClient*) = 0;
 
     // Initializes the various client interfaces.
-    virtual void setAutoFillClient(WebAutoFillClient*) = 0;
+    virtual void setAutofillClient(WebAutofillClient*) = 0;
     virtual void setDevToolsAgentClient(WebDevToolsAgentClient*) = 0;
     virtual void setPermissionClient(WebPermissionClient*) = 0;
     virtual void setSpellCheckClient(WebSpellCheckClient*) = 0;
@@ -277,16 +277,16 @@ public:
     virtual WebAccessibilityObject accessibilityObject() = 0;
 
 
-    // AutoFill  -----------------------------------------------------------
+    // Autofill  -----------------------------------------------------------
 
-    // Notifies the WebView that AutoFill suggestions are available for a node.
+    // Notifies the WebView that Autofill suggestions are available for a node.
     // |uniqueIDs| is a vector of IDs that represent the unique ID of each
-    // AutoFill profile in the suggestions popup.  If a unique ID is 0, then the
-    // corresponding suggestion comes from Autocomplete rather than AutoFill.
+    // Autofill profile in the suggestions popup. If a unique ID is 0, then the
+    // corresponding suggestion comes from Autocomplete rather than Autofill.
     // If a unique ID is negative, then the corresponding "suggestion" is
-    // actually a user-facing warning, e.g. explaining why AutoFill is
+    // actually a user-facing warning, e.g. explaining why Autofill is
     // unavailable for the current form.
-    virtual void applyAutoFillSuggestions(
+    virtual void applyAutofillSuggestions(
         const WebNode&,
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
similarity index 81%
rename from Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
rename to Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp
index c05c5f13b5be117b2c3cd815aa3ea0bc7e9cac0a..34a184f1897fdbe1e77c458a36ebaa773edb1754 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "AutoFillPopupMenuClient.h"
+#include "AutofillPopupMenuClient.h"
 
 #include "CSSFontSelector.h"
 #include "CSSStyleSelector.h"
@@ -40,7 +40,7 @@
 #include "HTMLInputElement.h"
 #include "Page.h"
 #include "RenderTheme.h"
-#include "WebAutoFillClient.h"
+#include "WebAutofillClient.h"
 #include "WebNode.h"
 #include "WebString.h"
 #include "WebVector.h"
@@ -51,23 +51,23 @@ using namespace WebCore;
 
 namespace WebKit {
 
-AutoFillPopupMenuClient::AutoFillPopupMenuClient()
+AutofillPopupMenuClient::AutofillPopupMenuClient()
     : m_separatorIndex(-1)
     , m_selectedIndex(-1)
     , m_textField(0)
 {
 }
 
-AutoFillPopupMenuClient::~AutoFillPopupMenuClient()
+AutofillPopupMenuClient::~AutofillPopupMenuClient()
 {
 }
 
-unsigned AutoFillPopupMenuClient::getSuggestionsCount() const
+unsigned AutofillPopupMenuClient::getSuggestionsCount() const
 {
     return m_names.size() + ((m_separatorIndex == -1) ? 0 : 1);
 }
 
-WebString AutoFillPopupMenuClient::getSuggestion(unsigned listIndex) const
+WebString AutofillPopupMenuClient::getSuggestion(unsigned listIndex) const
 {
     int index = convertListIndexToInternalIndex(listIndex);
     if (index == -1)
@@ -77,7 +77,7 @@ WebString AutoFillPopupMenuClient::getSuggestion(unsigned listIndex) const
     return m_names[index];
 }
 
-WebString AutoFillPopupMenuClient::getLabel(unsigned listIndex) const
+WebString AutofillPopupMenuClient::getLabel(unsigned listIndex) const
 {
     int index = convertListIndexToInternalIndex(listIndex);
     if (index == -1)
@@ -87,7 +87,7 @@ WebString AutoFillPopupMenuClient::getLabel(unsigned listIndex) const
     return m_labels[index];
 }
 
-WebString AutoFillPopupMenuClient::getIcon(unsigned listIndex) const
+WebString AutofillPopupMenuClient::getIcon(unsigned listIndex) const
 {
     int index = convertListIndexToInternalIndex(listIndex);
     if (index == -1)
@@ -97,7 +97,7 @@ WebString AutoFillPopupMenuClient::getIcon(unsigned listIndex) const
     return m_icons[index];
 }
 
-void AutoFillPopupMenuClient::removeSuggestionAtIndex(unsigned listIndex)
+void AutofillPopupMenuClient::removeSuggestionAtIndex(unsigned listIndex)
 {
     if (!canRemoveSuggestionAtIndex(listIndex))
         return;
@@ -116,7 +116,7 @@ void AutoFillPopupMenuClient::removeSuggestionAtIndex(unsigned listIndex)
         m_separatorIndex--;
 }
 
-bool AutoFillPopupMenuClient::canRemoveSuggestionAtIndex(unsigned listIndex)
+bool AutofillPopupMenuClient::canRemoveSuggestionAtIndex(unsigned listIndex)
 {
     // Only allow deletion of items before the separator that have unique id 0
     // (i.e. are autocomplete rather than autofill items).
@@ -124,7 +124,7 @@ bool AutoFillPopupMenuClient::canRemoveSuggestionAtIndex(unsigned listIndex)
     return !m_uniqueIDs[index] && (m_separatorIndex == -1 || listIndex < static_cast<unsigned>(m_separatorIndex));
 }
 
-void AutoFillPopupMenuClient::valueChanged(unsigned listIndex, bool fireEvents)
+void AutofillPopupMenuClient::valueChanged(unsigned listIndex, bool fireEvents)
 {
     WebViewImpl* webView = getWebView();
     if (!webView)
@@ -135,14 +135,14 @@ void AutoFillPopupMenuClient::valueChanged(unsigned listIndex, bool fireEvents)
 
     ASSERT(listIndex < m_names.size());
 
-    webView->autoFillClient()->didAcceptAutoFillSuggestion(WebNode(getTextField()),
+    webView->autofillClient()->didAcceptAutofillSuggestion(WebNode(getTextField()),
                                                            m_names[listIndex],
                                                            m_labels[listIndex],
                                                            m_uniqueIDs[listIndex],
                                                            listIndex);
 }
 
-void AutoFillPopupMenuClient::selectionChanged(unsigned listIndex, bool fireEvents)
+void AutofillPopupMenuClient::selectionChanged(unsigned listIndex, bool fireEvents)
 {
     WebViewImpl* webView = getWebView();
     if (!webView)
@@ -153,50 +153,50 @@ void AutoFillPopupMenuClient::selectionChanged(unsigned listIndex, bool fireEven
 
     ASSERT(listIndex < m_names.size());
 
-    webView->autoFillClient()->didSelectAutoFillSuggestion(WebNode(getTextField()),
+    webView->autofillClient()->didSelectAutofillSuggestion(WebNode(getTextField()),
                                                            m_names[listIndex],
                                                            m_labels[listIndex],
                                                            m_uniqueIDs[listIndex]);
 }
 
-void AutoFillPopupMenuClient::selectionCleared()
+void AutofillPopupMenuClient::selectionCleared()
 {
     WebViewImpl* webView = getWebView();
     if (webView)
-        webView->autoFillClient()->didClearAutoFillSelection(WebNode(getTextField()));
+        webView->autofillClient()->didClearAutofillSelection(WebNode(getTextField()));
 }
 
-String AutoFillPopupMenuClient::itemText(unsigned listIndex) const
+String AutofillPopupMenuClient::itemText(unsigned listIndex) const
 {
     return getSuggestion(listIndex);
 }
 
-String AutoFillPopupMenuClient::itemLabel(unsigned listIndex) const
+String AutofillPopupMenuClient::itemLabel(unsigned listIndex) const
 {
     return getLabel(listIndex);
 }
 
-String AutoFillPopupMenuClient::itemIcon(unsigned listIndex) const
+String AutofillPopupMenuClient::itemIcon(unsigned listIndex) const
 {
     return getIcon(listIndex);
 }
 
-bool AutoFillPopupMenuClient::itemIsEnabled(unsigned listIndex) const
+bool AutofillPopupMenuClient::itemIsEnabled(unsigned listIndex) const
 {
     return !itemIsWarning(listIndex);
 }
 
-PopupMenuStyle AutoFillPopupMenuClient::itemStyle(unsigned listIndex) const
+PopupMenuStyle AutofillPopupMenuClient::itemStyle(unsigned listIndex) const
 {
     return itemIsWarning(listIndex) ? *m_warningStyle : *m_regularStyle;
 }
 
-PopupMenuStyle AutoFillPopupMenuClient::menuStyle() const
+PopupMenuStyle AutofillPopupMenuClient::menuStyle() const
 {
     return *m_regularStyle;
 }
 
-int AutoFillPopupMenuClient::clientPaddingLeft() const
+int AutofillPopupMenuClient::clientPaddingLeft() const
 {
     // Bug http://crbug.com/7708 seems to indicate the style can be 0.
     RenderStyle* style = textFieldStyle();
@@ -206,7 +206,7 @@ int AutoFillPopupMenuClient::clientPaddingLeft() const
     return RenderTheme::defaultTheme()->popupInternalPaddingLeft(style);
 }
 
-int AutoFillPopupMenuClient::clientPaddingRight() const
+int AutofillPopupMenuClient::clientPaddingRight() const
 {
     // Bug http://crbug.com/7708 seems to indicate the style can be 0.
     RenderStyle* style = textFieldStyle();
@@ -216,22 +216,22 @@ int AutoFillPopupMenuClient::clientPaddingRight() const
     return RenderTheme::defaultTheme()->popupInternalPaddingRight(style);
 }
 
-void AutoFillPopupMenuClient::popupDidHide()
+void AutofillPopupMenuClient::popupDidHide()
 {
     WebViewImpl* webView = getWebView();
     if (!webView)
         return;
 
-    webView->autoFillPopupDidHide();
-    webView->autoFillClient()->didClearAutoFillSelection(WebNode(getTextField()));
+    webView->autofillPopupDidHide();
+    webView->autofillClient()->didClearAutofillSelection(WebNode(getTextField()));
 }
 
-bool AutoFillPopupMenuClient::itemIsSeparator(unsigned listIndex) const
+bool AutofillPopupMenuClient::itemIsSeparator(unsigned listIndex) const
 {
     return (m_separatorIndex != -1 && static_cast<unsigned>(m_separatorIndex) == listIndex);
 }
 
-bool AutoFillPopupMenuClient::itemIsWarning(unsigned listIndex) const
+bool AutofillPopupMenuClient::itemIsWarning(unsigned listIndex) const
 {
     int index = convertListIndexToInternalIndex(listIndex);
     if (index == -1)
@@ -241,22 +241,22 @@ bool AutoFillPopupMenuClient::itemIsWarning(unsigned listIndex) const
     return m_uniqueIDs[index] < 0;
 }
 
-void AutoFillPopupMenuClient::setTextFromItem(unsigned listIndex)
+void AutofillPopupMenuClient::setTextFromItem(unsigned listIndex)
 {
     m_textField->setValue(getSuggestion(listIndex));
 }
 
-FontSelector* AutoFillPopupMenuClient::fontSelector() const
+FontSelector* AutofillPopupMenuClient::fontSelector() const
 {
     return m_textField->document()->styleSelector()->fontSelector();
 }
 
-HostWindow* AutoFillPopupMenuClient::hostWindow() const
+HostWindow* AutofillPopupMenuClient::hostWindow() const
 {
     return m_textField->document()->view()->hostWindow();
 }
 
-PassRefPtr<Scrollbar> AutoFillPopupMenuClient::createScrollbar(
+PassRefPtr<Scrollbar> AutofillPopupMenuClient::createScrollbar(
     ScrollableArea* scrollableArea,
     ScrollbarOrientation orientation,
     ScrollbarControlSize size)
@@ -264,7 +264,7 @@ PassRefPtr<Scrollbar> AutoFillPopupMenuClient::createScrollbar(
     return Scrollbar::createNativeScrollbar(scrollableArea, orientation, size);
 }
 
-void AutoFillPopupMenuClient::initialize(
+void AutofillPopupMenuClient::initialize(
     HTMLInputElement* textField,
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
@@ -281,7 +281,7 @@ void AutoFillPopupMenuClient::initialize(
     m_textField = textField;
 
     // The suggestions must be set before initializing the
-    // AutoFillPopupMenuClient.
+    // AutofillPopupMenuClient.
     setSuggestions(names, labels, icons, uniqueIDs, separatorIndex);
 
     FontDescription regularFontDescription;
@@ -310,7 +310,7 @@ void AutoFillPopupMenuClient::initialize(
                                                  PopupMenuStyle::AutofillPopup));
 }
 
-void AutoFillPopupMenuClient::setSuggestions(const WebVector<WebString>& names,
+void AutofillPopupMenuClient::setSuggestions(const WebVector<WebString>& names,
                                              const WebVector<WebString>& labels,
                                              const WebVector<WebString>& icons,
                                              const WebVector<int>& uniqueIDs,
@@ -339,7 +339,7 @@ void AutoFillPopupMenuClient::setSuggestions(const WebVector<WebString>& names,
         setSelectedIndex(-1);
 }
 
-int AutoFillPopupMenuClient::convertListIndexToInternalIndex(unsigned listIndex) const
+int AutofillPopupMenuClient::convertListIndexToInternalIndex(unsigned listIndex) const
 {
     if (listIndex == static_cast<unsigned>(m_separatorIndex))
         return -1;
@@ -349,7 +349,7 @@ int AutoFillPopupMenuClient::convertListIndexToInternalIndex(unsigned listIndex)
     return listIndex - 1;
 }
 
-WebViewImpl* AutoFillPopupMenuClient::getWebView() const
+WebViewImpl* AutofillPopupMenuClient::getWebView() const
 {
     Frame* frame = m_textField->document()->frame();
     if (!frame)
@@ -362,7 +362,7 @@ WebViewImpl* AutoFillPopupMenuClient::getWebView() const
     return static_cast<WebViewImpl*>(page->chrome()->client()->webView());
 }
 
-RenderStyle* AutoFillPopupMenuClient::textFieldStyle() const
+RenderStyle* AutofillPopupMenuClient::textFieldStyle() const
 {
     RenderStyle* style = m_textField->computedStyle();
     if (!style) {
similarity index 95%
rename from Source/WebKit/chromium/src/AutoFillPopupMenuClient.h
rename to Source/WebKit/chromium/src/AutofillPopupMenuClient.h
index c61626aa3888aded757657df5da0c3b1f0f3bed1..7d2b985a2c2cce3d089974c0cb58e6268d58c7b3 100644 (file)
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AutoFillPopupMenuClient_h
-#define AutoFillPopupMenuClient_h
+#ifndef AutofillPopupMenuClient_h
+#define AutofillPopupMenuClient_h
 
 #include "PopupMenuClient.h"
 
@@ -45,12 +45,12 @@ class WebString;
 class WebViewImpl;
 template <typename T> class WebVector;
 
-// The AutoFill suggestions popup menu client, used to display name suggestions
+// The Autofill suggestions popup menu client, used to display name suggestions
 // with right-justified labels.
-class AutoFillPopupMenuClient : public WebCore::PopupMenuClient {
+class AutofillPopupMenuClient : public WebCore::PopupMenuClient {
 public:
-    AutoFillPopupMenuClient();
-    virtual ~AutoFillPopupMenuClient();
+    AutofillPopupMenuClient();
+    virtual ~AutofillPopupMenuClient();
 
     // Returns the number of suggestions available.
     virtual unsigned getSuggestionsCount() const;
index 102fef04e0dffd6dca2a4ba95b1e5bcf7233c8d6..ca8d4f99e97c18ccf610d6bf2dbb92141373a7e1 100644 (file)
@@ -43,7 +43,7 @@
 #include "SpellChecker.h"
 
 #include "DOMUtilitiesPrivate.h"
-#include "WebAutoFillClient.h"
+#include "WebAutofillClient.h"
 #include "WebEditingAction.h"
 #include "WebElement.h"
 #include "WebFrameClient.h"
@@ -664,15 +664,15 @@ void EditorClientImpl::handleInputMethodKeydown(KeyboardEvent* keyEvent)
 void EditorClientImpl::textFieldDidBeginEditing(Element* element)
 {
     HTMLInputElement* inputElement = toHTMLInputElement(element);
-    if (m_webView->autoFillClient() && inputElement)
-        m_webView->autoFillClient()->textFieldDidBeginEditing(WebInputElement(inputElement));
+    if (m_webView->autofillClient() && inputElement)
+        m_webView->autofillClient()->textFieldDidBeginEditing(WebInputElement(inputElement));
 }
 
 void EditorClientImpl::textFieldDidEndEditing(Element* element)
 {
     HTMLInputElement* inputElement = toHTMLInputElement(element);
-    if (m_webView->autoFillClient() && inputElement)
-        m_webView->autoFillClient()->textFieldDidEndEditing(WebInputElement(inputElement));
+    if (m_webView->autofillClient() && inputElement)
+        m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(inputElement));
 
     // Notification that focus was lost.  Be careful with this, it's also sent
     // when the page is being closed.
@@ -682,7 +682,7 @@ void EditorClientImpl::textFieldDidEndEditing(Element* element)
     m_autofillTimer.stop();
 
     // Hide any showing popup.
-    m_webView->hideAutoFillPopup();
+    m_webView->hideAutofillPopup();
 
     if (!m_webView->client())
         return; // The page is getting closed, don't fill the password.
@@ -706,8 +706,8 @@ void EditorClientImpl::textDidChangeInTextField(Element* element)
 {
     ASSERT(element->hasLocalName(HTMLNames::inputTag));
     HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(element);
-    if (m_webView->autoFillClient())
-        m_webView->autoFillClient()->textFieldDidChange(WebInputElement(inputElement));
+    if (m_webView->autofillClient())
+        m_webView->autofillClient()->textFieldDidChange(WebInputElement(inputElement));
 
     // 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.
@@ -778,7 +778,7 @@ void EditorClientImpl::doAutofill(Timer<EditorClientImpl>* timer)
                        && inputElement->selectionEnd() == static_cast<int>(value.length());
 
     if ((!args->autofillOnEmptyValue && value.isEmpty()) || !isCaretAtEnd) {
-        m_webView->hideAutoFillPopup();
+        m_webView->hideAutofillPopup();
         return;
     }
 
@@ -810,8 +810,8 @@ bool EditorClientImpl::doTextFieldCommandFromEvent(Element* element,
                                                    KeyboardEvent* event)
 {
     HTMLInputElement* inputElement = toHTMLInputElement(element);
-    if (m_webView->autoFillClient() && inputElement) {
-        m_webView->autoFillClient()->textFieldDidReceiveKeyDown(WebInputElement(inputElement),
+    if (m_webView->autofillClient() && inputElement) {
+        m_webView->autofillClient()->textFieldDidReceiveKeyDown(WebInputElement(inputElement),
                                                                 WebKeyboardEventBuilder(*event));
     }
 
index 13416be1f07f10e634d4bff69faa3fac68d25920..5e7a1cfbe6fa59071e039dcb1f9e5c287f6ac49f 100644 (file)
@@ -120,9 +120,9 @@ bool WebInputElement::isAutofilled() const
     return constUnwrap<HTMLInputElement>()->isAutofilled();
 }
 
-void WebInputElement::setAutofilled(bool autoFilled)
+void WebInputElement::setAutofilled(bool autofilled)
 {
-    unwrap<HTMLInputElement>()->setAutofilled(autoFilled);
+    unwrap<HTMLInputElement>()->setAutofilled(autofilled);
 }
 
 void WebInputElement::setSelectionRange(int start, int end)
index 77480c7f7633267bf917865ed197199e20f18317..a5ac80dff248f8be250ad0742d7b786c04c7fa01 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebViewImpl.h"
 
-#include "AutoFillPopupMenuClient.h"
+#include "AutofillPopupMenuClient.h"
 #include "AXObjectCache.h"
 #include "BackForwardListChromium.h"
 #include "CSSStyleSelector.h"
@@ -99,7 +99,7 @@
 #include "UserGestureIndicator.h"
 #include "Vector.h"
 #include "WebAccessibilityObject.h"
-#include "WebAutoFillClient.h"
+#include "WebAutofillClient.h"
 #include "WebDevToolsAgentImpl.h"
 #include "WebDevToolsAgentPrivate.h"
 #include "WebDragData.h"
@@ -205,7 +205,7 @@ COMPILE_ASSERT_MATCHING_ENUM(DragOperationMove);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationDelete);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery);
 
-static const PopupContainerSettings autoFillPopupSettings = {
+static const PopupContainerSettings autofillPopupSettings = {
     false, // setTextOnIndexChange
     false, // acceptOnAbandon
     true, // loopSelectionNavigation
@@ -275,9 +275,9 @@ void WebViewImpl::initializeMainFrame(WebFrameClient* frameClient)
     SecurityOrigin::setLocalLoadPolicy(SecurityOrigin::AllowLocalLoadsForLocalOnly);
 }
 
-void WebViewImpl::setAutoFillClient(WebAutoFillClient* autoFillClient)
+void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient)
 {
-    m_autoFillClient = autoFillClient;
+    m_autofillClient = autofillClient;
 }
 
 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) 
@@ -300,7 +300,7 @@ void WebViewImpl::setSpellCheckClient(WebSpellCheckClient* spellCheckClient)
 
 WebViewImpl::WebViewImpl(WebViewClient* client)
     : m_client(client)
-    , m_autoFillClient(0)
+    , m_autofillClient(0)
     , m_permissionClient(0)
     , m_spellCheckClient(0)
     , m_chromeClientImpl(this)
@@ -323,8 +323,8 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
     , m_imeAcceptEvents(true)
     , m_operationsAllowed(WebDragOperationNone)
     , m_dragOperation(WebDragOperationNone)
-    , m_autoFillPopupShowing(false)
-    , m_autoFillPopup(0)
+    , m_autofillPopupShowing(false)
+    , m_autofillPopup(0)
     , m_isTransparent(false)
     , m_tabsToLinks(false)
     , m_dragScrollTimer(adoptPtr(new DragScrollTimer))
@@ -460,7 +460,7 @@ void WebViewImpl::mouseDown(const WebMouseEvent& event)
             m_mouseCaptureNode = hitNode;
 
         // If a text field that has focus is clicked again, we should display the
-        // AutoFill popup.
+        // Autofill popup.
         RefPtr<Node> focusedNode = focusedWebCoreNode();
         if (focusedNode.get() && toHTMLInputElement(focusedNode.get())) {
             if (hitNode == focusedNode) {
@@ -478,7 +478,7 @@ void WebViewImpl::mouseDown(const WebMouseEvent& event)
         PlatformMouseEventBuilder(mainFrameImpl()->frameView(), event));
 
     if (clickedNode.get() && clickedNode == focusedWebCoreNode()) {
-        // Focus has not changed, show the AutoFill popup.
+        // Focus has not changed, show the Autofill popup.
         static_cast<EditorClientImpl*>(m_page->editorClient())->
             showFormAutofillForNode(clickedNode.get());
     }
@@ -655,7 +655,7 @@ bool WebViewImpl::keyEvent(const WebKeyboardEvent& event)
 
 bool WebViewImpl::autocompleteHandleKeyEvent(const WebKeyboardEvent& event)
 {
-    if (!m_autoFillPopupShowing
+    if (!m_autofillPopupShowing
         // Home and End should be left to the text field to process.
         || event.windowsKeyCode == VKEY_HOME
         || event.windowsKeyCode == VKEY_END)
@@ -663,7 +663,7 @@ bool WebViewImpl::autocompleteHandleKeyEvent(const WebKeyboardEvent& event)
 
     // Pressing delete triggers the removal of the selected suggestion from the DB.
     if (event.windowsKeyCode == VKEY_DELETE
-        && m_autoFillPopup->selectedIndex() != -1) {
+        && m_autofillPopup->selectedIndex() != -1) {
         Node* node = focusedWebCoreNode();
         if (!node || (node->nodeType() != Node::ELEMENT_NODE)) {
             ASSERT_NOT_REACHED();
@@ -675,25 +675,25 @@ bool WebViewImpl::autocompleteHandleKeyEvent(const WebKeyboardEvent& event)
             return false;
         }
 
-        int selectedIndex = m_autoFillPopup->selectedIndex();
+        int selectedIndex = m_autofillPopup->selectedIndex();
 
-        if (!m_autoFillPopupClient->canRemoveSuggestionAtIndex(selectedIndex))
+        if (!m_autofillPopupClient->canRemoveSuggestionAtIndex(selectedIndex))
             return false;
 
         WebString name = WebInputElement(static_cast<HTMLInputElement*>(element)).nameForAutofill();
-        WebString value = m_autoFillPopupClient->itemText(selectedIndex);
-        m_autoFillClient->removeAutocompleteSuggestion(name, value);
+        WebString value = m_autofillPopupClient->itemText(selectedIndex);
+        m_autofillClient->removeAutocompleteSuggestion(name, value);
         // Update the entries in the currently showing popup to reflect the
         // deletion.
-        m_autoFillPopupClient->removeSuggestionAtIndex(selectedIndex);
-        refreshAutoFillPopup();
+        m_autofillPopupClient->removeSuggestionAtIndex(selectedIndex);
+        refreshAutofillPopup();
         return false;
     }
 
-    if (!m_autoFillPopup->isInterestedInEventForKey(event.windowsKeyCode))
+    if (!m_autofillPopup->isInterestedInEventForKey(event.windowsKeyCode))
         return false;
 
-    if (m_autoFillPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event))) {
+    if (m_autofillPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event))) {
         // We need to ignore the next Char event after this otherwise pressing
         // enter when selecting an item in the menu will go to the page.
         if (WebInputEvent::RawKeyDown == event.type)
@@ -926,11 +926,11 @@ void  WebViewImpl::popupClosed(WebCore::PopupContainer* popupContainer)
     }
 }
 
-void WebViewImpl::hideAutoFillPopup()
+void WebViewImpl::hideAutofillPopup()
 {
-    if (m_autoFillPopupShowing) {
-        m_autoFillPopup->hidePopup();
-        m_autoFillPopupShowing = false;
+    if (m_autofillPopupShowing) {
+        m_autofillPopup->hidePopup();
+        m_autofillPopupShowing = false;
     }
 }
 
@@ -1338,7 +1338,7 @@ void WebViewImpl::setFocus(bool enable)
         }
         m_imeAcceptEvents = true;
     } else {
-        hideAutoFillPopup();
+        hideAutofillPopup();
         hideSelectPopup();
 
         // Clear focus on the currently focused frame if any.
@@ -2075,7 +2075,7 @@ WebAccessibilityObject WebViewImpl::accessibilityObject()
         document->axObjectCache()->getOrCreate(document->renderer()));
 }
 
-void WebViewImpl::applyAutoFillSuggestions(
+void WebViewImpl::applyAutofillSuggestions(
     const WebNode& node,
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
@@ -2088,48 +2088,48 @@ void WebViewImpl::applyAutoFillSuggestions(
     ASSERT(separatorIndex < static_cast<int>(names.size()));
 
     if (names.isEmpty()) {
-        hideAutoFillPopup();
+        hideAutofillPopup();
         return;
     }
 
     RefPtr<Node> focusedNode = focusedWebCoreNode();
-    // If the node for which we queried the AutoFill suggestions is not the
+    // If the node for which we queried the Autofill suggestions is not the
     // focused node, then we have nothing to do.  FIXME: also check the
     // caret is at the end and that the text has not changed.
     if (!focusedNode || focusedNode != PassRefPtr<Node>(node)) {
-        hideAutoFillPopup();
+        hideAutofillPopup();
         return;
     }
 
     HTMLInputElement* inputElem =
         static_cast<HTMLInputElement*>(focusedNode.get());
 
-    // The first time the AutoFill popup is shown we'll create the client and
+    // The first time the Autofill popup is shown we'll create the client and
     // the popup.
-    if (!m_autoFillPopupClient)
-        m_autoFillPopupClient = adoptPtr(new AutoFillPopupMenuClient);
+    if (!m_autofillPopupClient)
+        m_autofillPopupClient = adoptPtr(new AutofillPopupMenuClient);
 
-    m_autoFillPopupClient->initialize(
+    m_autofillPopupClient->initialize(
         inputElem, names, labels, icons, uniqueIDs, separatorIndex);
 
-    if (!m_autoFillPopup.get()) {
-        m_autoFillPopup = PopupContainer::create(m_autoFillPopupClient.get(),
+    if (!m_autofillPopup.get()) {
+        m_autofillPopup = PopupContainer::create(m_autofillPopupClient.get(),
                                                  PopupContainer::Suggestion,
-                                                 autoFillPopupSettings);
+                                                 autofillPopupSettings);
     }
 
-    if (m_autoFillPopupShowing) {
-        refreshAutoFillPopup();
+    if (m_autofillPopupShowing) {
+        refreshAutofillPopup();
     } else {
-        m_autoFillPopup->showInRect(focusedNode->getRect(), focusedNode->ownerDocument()->view(), 0);
-        m_autoFillPopupShowing = true;
+        m_autofillPopup->showInRect(focusedNode->getRect(), focusedNode->ownerDocument()->view(), 0);
+        m_autofillPopupShowing = true;
     }
 }
 
 void WebViewImpl::hidePopups()
 {
     hideSelectPopup();
-    hideAutoFillPopup();
+    hideAutofillPopup();
 }
 
 void WebViewImpl::performCustomContextMenuAction(unsigned action)
@@ -2355,23 +2355,23 @@ NotificationPresenterImpl* WebViewImpl::notificationPresenterImpl()
 }
 #endif
 
-void WebViewImpl::refreshAutoFillPopup()
+void WebViewImpl::refreshAutofillPopup()
 {
-    ASSERT(m_autoFillPopupShowing);
+    ASSERT(m_autofillPopupShowing);
 
     // Hide the popup if it has become empty.
-    if (!m_autoFillPopupClient->listSize()) {
-        hideAutoFillPopup();
+    if (!m_autofillPopupClient->listSize()) {
+        hideAutofillPopup();
         return;
     }
 
-    IntRect oldBounds = m_autoFillPopup->frameRect();
-    m_autoFillPopup->refresh(focusedWebCoreNode()->getRect());
-    IntRect newBounds = m_autoFillPopup->frameRect();
+    IntRect oldBounds = m_autofillPopup->frameRect();
+    m_autofillPopup->refresh(focusedWebCoreNode()->getRect());
+    IntRect newBounds = m_autofillPopup->frameRect();
     // Let's resize the backing window if necessary.
     if (oldBounds != newBounds) {
         WebPopupMenuImpl* popupMenu =
-            static_cast<WebPopupMenuImpl*>(m_autoFillPopup->client());
+            static_cast<WebPopupMenuImpl*>(m_autofillPopup->client());
         if (popupMenu)
             popupMenu->client()->setWindowRect(m_chromeClientImpl.windowToScreen(newBounds));
     }
index 7f034769a5c5c15c9743f542af4b87afde0e0be5..29a6682903ef5869738ccd6162a103b8e5fdc7b3 100644 (file)
@@ -71,7 +71,7 @@ class Widget;
 
 namespace WebKit {
 class AutocompletePopupMenuClient;
-class AutoFillPopupMenuClient;
+class AutofillPopupMenuClient;
 class ContextMenuClientImpl;
 class DeviceOrientationClientProxy;
 class DragScrollTimer;
@@ -121,7 +121,7 @@ public:
 
     // WebView methods:
     virtual void initializeMainFrame(WebFrameClient*);
-    virtual void setAutoFillClient(WebAutoFillClient*);
+    virtual void setAutofillClient(WebAutofillClient*);
     virtual void setDevToolsAgentClient(WebDevToolsAgentClient*);
     virtual void setPermissionClient(WebPermissionClient*);
     virtual void setSpellCheckClient(WebSpellCheckClient*);
@@ -186,7 +186,7 @@ public:
                                      const WebString& value);
     virtual WebDevToolsAgent* devToolsAgent();
     virtual WebAccessibilityObject accessibilityObject();
-    virtual void applyAutoFillSuggestions(
+    virtual void applyAutofillSuggestions(
         const WebNode&,
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
@@ -234,9 +234,9 @@ public:
         return m_client;
     }
 
-    WebAutoFillClient* autoFillClient()
+    WebAutofillClient* autofillClient()
     {
-        return m_autoFillClient;
+        return m_autofillClient;
     }
 
     WebPermissionClient* permissionClient()
@@ -326,9 +326,9 @@ public:
         const WebImage& dragImage,
         const WebPoint& dragImageOffset);
 
-    void autoFillPopupDidHide()
+    void autofillPopupDidHide()
     {
-        m_autoFillPopupShowing = false;
+        m_autofillPopupShowing = false;
     }
 
 #if ENABLE(NOTIFICATIONS)
@@ -344,7 +344,7 @@ public:
     void popupOpened(WebCore::PopupContainer* popupContainer);
     void popupClosed(WebCore::PopupContainer* popupContainer);
 
-    void hideAutoFillPopup();
+    void hideAutofillPopup();
 
     // Returns the input event we're currently processing. This is used in some
     // cases where the WebCore DOM event doesn't have the information we need.
@@ -403,10 +403,10 @@ private:
     // Returns true if the autocomple has consumed the event.
     bool autocompleteHandleKeyEvent(const WebKeyboardEvent&);
 
-    // Repaints the AutoFill popup. Should be called when the suggestions
-    // have changed. Note that this should only be called when the AutoFill
+    // Repaints the Autofill popup. Should be called when the suggestions
+    // have changed. Note that this should only be called when the Autofill
     // popup is showing.
-    void refreshAutoFillPopup();
+    void refreshAutofillPopup();
 
     // Returns true if the view was scrolled.
     bool scrollViewWithKeyboard(int keyCode, int modifiers);
@@ -435,7 +435,7 @@ private:
 #endif
 
     WebViewClient* m_client;
-    WebAutoFillClient* m_autoFillClient;
+    WebAutofillClient* m_autofillClient;
     WebPermissionClient* m_permissionClient;
     WebSpellCheckClient* m_spellCheckClient;
 
@@ -510,14 +510,14 @@ private:
     // current drop target in this WebView (the drop target can accept the drop).
     WebDragOperation m_dragOperation;
 
-    // Whether an AutoFill popup is currently showing.
-    bool m_autoFillPopupShowing;
+    // Whether an Autofill popup is currently showing.
+    bool m_autofillPopupShowing;
 
-    // The AutoFill popup client.
-    OwnPtr<AutoFillPopupMenuClient> m_autoFillPopupClient;
+    // The Autofill popup client.
+    OwnPtr<AutofillPopupMenuClient> m_autofillPopupClient;
 
-    // The AutoFill popup.
-    RefPtr<WebCore::PopupContainer> m_autoFillPopup;
+    // The Autofill popup.
+    RefPtr<WebCore::PopupContainer> m_autofillPopup;
 
     // The popup associated with a select element.
     RefPtr<WebCore::PopupContainer> m_selectPopup;