Changeset 60985 in webkit

Timestamp:

Jun 10, 2010 5:51:36 PM (14 years ago)

Author:

jhawkins@chromium.org

Message:

2010-06-09 James Hawkins <​jhawkins@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Add the ability to specify a separator in
AutoFillPopupMenuClient.

​https://bugs.webkit.org/show_bug.cgi?id=40397

• public/WebViewClient.h: (WebKit::WebViewClient::didAcceptAutoFillSuggestion):
• src/AutoFillPopupMenuClient.cpp: (WebKit::AutoFillPopupMenuClient::getSuggestionsCount): (WebKit::AutoFillPopupMenuClient::getSuggestion): (WebKit::AutoFillPopupMenuClient::valueChanged): (WebKit::AutoFillPopupMenuClient::selectionChanged): (WebKit::AutoFillPopupMenuClient::itemIsSeparator): (WebKit::AutoFillPopupMenuClient::initialize): (WebKit::AutoFillPopupMenuClient::setSuggestions):
• src/AutoFillPopupMenuClient.h:
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::applyAutoFillSuggestions):
• src/WebViewImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebViewClient.h (modified) (3 diffs)
• src/AutoFillPopupMenuClient.cpp (modified) (6 diffs)
• src/AutoFillPopupMenuClient.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (3 diffs)
• src/WebViewImpl.h (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-09  James Hawkins  <jhawkins@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add the ability to specify a separator in
+        AutoFillPopupMenuClient.
+
+        https://bugs.webkit.org/show_bug.cgi?id=40397
+
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::didAcceptAutoFillSuggestion):
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::getSuggestionsCount):
+        (WebKit::AutoFillPopupMenuClient::getSuggestion):
+        (WebKit::AutoFillPopupMenuClient::valueChanged):
+        (WebKit::AutoFillPopupMenuClient::selectionChanged):
+        (WebKit::AutoFillPopupMenuClient::itemIsSeparator):
+        (WebKit::AutoFillPopupMenuClient::initialize):
+        (WebKit::AutoFillPopupMenuClient::setSuggestions):
+        * src/AutoFillPopupMenuClient.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::applyAutoFillSuggestions):
+        * src/WebViewImpl.h:
+
 2010-06-10  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebKit/chromium/public/WebViewClient.h

@@ -277 +277 @@
 
 
-    // Autofill ------------------------------------------------------------
+    // AutoFill ------------------------------------------------------------
 
     // Queries the browser for suggestions to be shown for the form text
@@ -286 +286 @@
                                           const WebString& value) { }
 
-    // Instructs the browser to remove the autofill entry specified from
+    // Instructs the browser to remove the Autocomplete entry specified from
     // its DB.
+    // FIXME: This method should be named removeAutocompleteSugestion.
     virtual void removeAutofillSuggestions(const WebString& name,
                                            const WebString& value) { }
@@ -293 +294 @@
     // Informs the browser that the user has accepted an AutoFill suggestion for
     // a WebNode.  |name| and |label| form a key into the set of AutoFill
-    // profiles.
+    // profiles.  |index| is an index of the selected suggestion in the list of
+    // suggestions provided by the client
     virtual void didAcceptAutoFillSuggestion(const WebNode&,
                                              const WebString& name,
-                                             const WebString& label) { }
+                                             const WebString& label,
+                                             unsigned index) { }
 
     // Informs the browser that the user has selected an AutoFill suggestion for

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

@@ -45 +45 @@
 unsigned AutoFillPopupMenuClient::getSuggestionsCount() const
 {
-    return m_names.size();
+    return m_names.size() + ((m_separatorIndex == -1) ? 0 : 1);
 }
 
 WebString AutoFillPopupMenuClient::getSuggestion(unsigned listIndex) const
 {
+    if (listIndex == m_separatorIndex)
+        return WebString();
+
+    if (m_separatorIndex != -1 && listIndex > m_separatorIndex)
+        --listIndex;
+
     // FIXME: Modify the PopupMenu to add the label in gray right-justified.
     ASSERT(listIndex >= 0 && listIndex < m_names.size());
-    return m_names[listIndex] + String(" (") + m_labels[listIndex] + String(")");
+
+    WebString suggestion = m_names[listIndex];
+    if (m_labels[listIndex].isEmpty())
+        return suggestion;
+
+    return suggestion + String(" (") + m_labels[listIndex] + String(")");
 }
 
@@ -65 +76 @@
 void AutoFillPopupMenuClient::valueChanged(unsigned listIndex, bool fireEvents)
 {
-    ASSERT(listIndex >= 0 && listIndex < m_names.size());
-
     WebViewImpl* webView = getWebView();
     if (!webView)
         return;
 
+    if (m_separatorIndex != -1 && listIndex > m_separatorIndex)
+        --listIndex;
+
+    ASSERT(listIndex >= 0 && listIndex < m_names.size());
+
     webView->client()->didAcceptAutoFillSuggestion(WebNode(getTextField()),
                                                    m_names[listIndex],
-                                                   m_labels[listIndex]);
+                                                   m_labels[listIndex],
+                                                   listIndex);
 }
 
 void AutoFillPopupMenuClient::selectionChanged(unsigned listIndex, bool fireEvents)
 {
-    ASSERT(listIndex >= 0 && listIndex < m_names.size());
-
     WebViewImpl* webView = getWebView();
     if (!webView)
         return;
+
+    if (m_separatorIndex != -1 && listIndex > m_separatorIndex)
+        --listIndex;
+
+    ASSERT(listIndex >= 0 && listIndex < m_names.size());
 
     webView->client()->didSelectAutoFillSuggestion(WebNode(getTextField()),
@@ -93 +111 @@
     WebViewImpl* webView = getWebView();
     if (!webView)
-      return;
+        return;
 
     webView->client()->didClearAutoFillSelection(WebNode(getTextField()));
@@ -104 +122 @@
     WebViewImpl* webView = getWebView();
     if (!webView)
-      return;
+        return;
 
     webView->client()->didClearAutoFillSelection(WebNode(getTextField()));
+}
+
+bool AutoFillPopupMenuClient::itemIsSeparator(unsigned listIndex) const
+{
+    return (m_separatorIndex != -1 && m_separatorIndex == listIndex);
 }
 
@@ -113 +136 @@
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
-    int defaultSuggestionIndex)
+    int separatorIndex)
 {
     ASSERT(names.size() == labels.size());
-    ASSERT(defaultSuggestionIndex < static_cast<int>(names.size()));
+    ASSERT(separatorIndex < static_cast<int>(names.size()));
 
     // The suggestions must be set before initializing the
     // SuggestionsPopupMenuClient.
-    setSuggestions(names, labels);
+    setSuggestions(names, labels, separatorIndex);
 
-    SuggestionsPopupMenuClient::initialize(textField, defaultSuggestionIndex);
+    SuggestionsPopupMenuClient::initialize(textField, -1);
 }
 
 void AutoFillPopupMenuClient::setSuggestions(const WebVector<WebString>& names,
-                                             const WebVector<WebString>& labels)
+                                             const WebVector<WebString>& labels,
+                                             int separatorIndex)
 {
     ASSERT(names.size() == labels.size());
+    ASSERT(separatorIndex < static_cast<int>(names.size()));
 
     m_names.clear();
@@ -137 +162 @@
     }
 
+    m_separatorIndex = separatorIndex;
+
     // Try to preserve selection if possible.
     if (getSelectedIndex() >= static_cast<int>(names.size()))

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.h

@@ -56 +56 @@
     virtual void selectionCleared();
     virtual void popupDidHide();
+    virtual bool itemIsSeparator(unsigned listIndex) const;
 
     void initialize(WebCore::HTMLInputElement*,
                     const WebVector<WebString>& names,
                     const WebVector<WebString>& labels,
-                    int defaultSuggestionIndex);
+                    int separatorIndex);
 
     void setSuggestions(const WebVector<WebString>& names,
-                        const WebVector<WebString>& labels);
+                        const WebVector<WebString>& labels,
+                        int separatorIndex);
 
 private:
     Vector<WebCore::String> m_names;
     Vector<WebCore::String> m_labels;
+
+    // The index of the separator.  -1 if there is no separator.
+    int m_separatorIndex;
 };
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -1787 +1787 @@
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
-    int defaultSuggestionIndex)
+    int separatorIndex)
 {
     ASSERT(names.size() == labels.size());
-    ASSERT(defaultSuggestionIndex < static_cast<int>(names.size()));
+    ASSERT(separatorIndex < static_cast<int>(names.size()));
 
     if (names.isEmpty()) {
@@ -1815 +1815 @@
 
     m_autoFillPopupClient->initialize(inputElem, names, labels,
-                                      defaultSuggestionIndex);
+                                      separatorIndex);
 
     if (m_suggestionsPopupClient != m_autoFillPopupClient.get()) {
@@ -1832 +1832 @@
 
     if (m_suggestionsPopupShowing) {
-        m_autoFillPopupClient->setSuggestions(names, labels);
+        m_autoFillPopupClient->setSuggestions(names, labels, separatorIndex);
         refreshSuggestionsPopup();
     } else {

trunk/WebKit/chromium/src/WebViewImpl.h

@@ -167 +167 @@
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
-        int defaultSuggestionIndex);
+        int separatorIndex);
     virtual void applyAutocompleteSuggestions(
         const WebNode&,