Changeset 64173 in webkit

Timestamp:

Jul 27, 2010 4:02:00 PM (14 years ago)

Author:

jhawkins@chromium.org

Message:

2010-07-27 James Hawkins <​jhawkins@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Add the ability to show right-aligned icons in the AutoFill popup.
​https://bugs.webkit.org/show_bug.cgi?id=43076

• public/WebView.h:
• src/AutoFillPopupMenuClient.cpp: (WebKit::AutoFillPopupMenuClient::getIcon): (WebKit::AutoFillPopupMenuClient::removeSuggestionAtIndex): (WebKit::AutoFillPopupMenuClient::itemIcon): (WebKit::AutoFillPopupMenuClient::initialize): (WebKit::AutoFillPopupMenuClient::setSuggestions):
• src/AutoFillPopupMenuClient.h:
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::applyAutoFillSuggestions): (WebKit::WebViewImpl::applyAutocompleteSuggestions):
• src/WebViewImpl.h:

2010-07-27 James Hawkins <​jhawkins@chromium.org>

Reviewed by Darin Fisher.

Add itemIcon() method to the PopupMenuClient, used by Chrome AutoFill
to display right-aligned credit card icons in the suggestions popup.
​https://bugs.webkit.org/show_bug.cgi?id=43076

No new tests as this is only used by the Chromium WebKit API.

• platform/PopupMenuClient.h:
• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::paintRow):
• rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::itemIcon):
• rendering/RenderMenuList.h:
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::itemIcon):
• rendering/RenderTextControlSingleLine.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PopupMenuClient.h (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (3 diffs)
• WebCore/rendering/RenderMenuList.cpp (modified) (1 diff)
• WebCore/rendering/RenderMenuList.h (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebView.h (modified) (2 diffs)
• WebKit/chromium/src/AutoFillPopupMenuClient.cpp (modified) (7 diffs)
• WebKit/chromium/src/AutoFillPopupMenuClient.h (modified) (5 diffs)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (6 diffs)
• WebKit/chromium/src/WebViewImpl.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-27  James Hawkins  <jhawkins@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Add itemIcon() method to the PopupMenuClient, used by Chrome AutoFill
+        to display right-aligned credit card icons in the suggestions popup.
+        https://bugs.webkit.org/show_bug.cgi?id=43076
+
+        No new tests as this is only used by the Chromium WebKit API.
+
+        * platform/PopupMenuClient.h:
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::paintRow):
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::itemIcon):
+        * rendering/RenderMenuList.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::itemIcon):
+        * rendering/RenderTextControlSingleLine.h:
+
 2010-07-27  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/platform/PopupMenuClient.h

@@ -44 +44 @@
     virtual String itemText(unsigned listIndex) const = 0;
     virtual String itemLabel(unsigned listIndex) const = 0;
+    virtual String itemIcon(unsigned listIndex) const = 0;
     virtual String itemToolTip(unsigned listIndex) const = 0;
     virtual String itemAccessibilityText(unsigned listIndex) const = 0;

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -72 +72 @@
 static const int kBorderSize = 1;
 static const int kTextToLabelPadding = 10;
+static const int kLabelToIconPadding = 5;
 static const TimeStamp kTypeAheadTimeoutMs = 1000;
 
@@ -960 +961 @@
     gc->drawBidiText(itemFont, textRun, IntPoint(textX, textY));
 
+    // We are using the left padding as the right padding includes room for the scroll-bar which
+    // does not show in this case.
+    int rightPadding = max(0, m_popupClient->clientPaddingLeft() - m_popupClient->clientInsetLeft());
+    int remainingWidth = rowRect.width() - rightPadding;
+
+    // Draw the icon if applicable.
+    String itemIcon = m_popupClient->itemIcon(rowIndex);
+    RefPtr<Image> image(Image::loadPlatformResource(itemIcon.utf8().data()));
+    if (image && !image->isNull()) {
+        IntRect imageRect = image->rect();
+        remainingWidth -= (imageRect.width() + kLabelToIconPadding);
+        imageRect.setX(rowRect.width() - rightPadding - imageRect.width());
+        imageRect.setY(rowRect.y() + (rowRect.height() - imageRect.height()) / 2);
+        gc->drawImage(image.get(), DeviceColorSpace, imageRect);
+    }
+
     // Draw the the label if applicable.
     if (itemLabel.isEmpty())
@@ -966 +983 @@
     if (rightAligned)
         textX = max(0, m_popupClient->clientPaddingLeft() - m_popupClient->clientInsetLeft());
-    else {
-        // We are using the left padding as the right padding includes room for the scroll-bar which
-        // does not show in this case.
-        int rightPadding = max(0, m_popupClient->clientPaddingLeft() - m_popupClient->clientInsetLeft());
-        textX = rowRect.width() - rightPadding - itemFont.width(labelTextRun);
-    }
+    else
+        textX = remainingWidth - itemFont.width(labelTextRun);
 
     gc->setFillColor(labelColor, DeviceColorSpace);

trunk/WebCore/rendering/RenderMenuList.cpp

@@ -355 +355 @@
 }
 
+String RenderMenuList::itemIcon(unsigned) const
+{
+    return String();
+}
+
 String RenderMenuList::itemAccessibilityText(unsigned listIndex) const
 {

trunk/WebCore/rendering/RenderMenuList.h

@@ -84 +84 @@
     virtual String itemText(unsigned listIndex) const;
     virtual String itemLabel(unsigned listIndex) const;
+    virtual String itemIcon(unsigned listIndex) const;
     virtual String itemToolTip(unsigned listIndex) const;
     virtual String itemAccessibilityText(unsigned listIndex) const;

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -917 +917 @@
 }
 
+String RenderTextControlSingleLine::itemIcon(unsigned) const
+{
+    return String();
+}
+
 bool RenderTextControlSingleLine::itemIsEnabled(unsigned listIndex) const
 {

trunk/WebCore/rendering/RenderTextControlSingleLine.h

@@ -118 +118 @@
     virtual String itemText(unsigned listIndex) const;
     virtual String itemLabel(unsigned listIndex) const;
+    virtual String itemIcon(unsigned listIndex) const;
     virtual String itemToolTip(unsigned) const { return String(); }
     virtual String itemAccessibilityText(unsigned) const { return String(); }

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-27  James Hawkins  <jhawkins@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add the ability to show right-aligned icons in the AutoFill popup.
+        https://bugs.webkit.org/show_bug.cgi?id=43076
+
+        * public/WebView.h:
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::getIcon):
+        (WebKit::AutoFillPopupMenuClient::removeSuggestionAtIndex):
+        (WebKit::AutoFillPopupMenuClient::itemIcon):
+        (WebKit::AutoFillPopupMenuClient::initialize):
+        (WebKit::AutoFillPopupMenuClient::setSuggestions):
+        * src/AutoFillPopupMenuClient.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::applyAutoFillSuggestions):
+        (WebKit::WebViewImpl::applyAutocompleteSuggestions):
+        * src/WebViewImpl.h:
+
 2010-07-27  Brett Wilson  <brettw@chromium.org>
 

trunk/WebKit/chromium/public/WebView.h

@@ -254 +254 @@
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
+        const WebVector<int>& uniqueIDs,
         int separatorIndex) = 0;
 
@@ -263 +264 @@
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
+        const WebVector<WebString>& icons,
         const WebVector<int>& uniqueIDs,
         int separatorIndex) = 0;

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

@@ -85 +85 @@
 }
 
+WebString AutoFillPopupMenuClient::getIcon(unsigned listIndex) const
+{
+    int index = convertListIndexToInternalIndex(listIndex);
+    if (index == -1)
+        return WebString();
+
+    ASSERT(index >= 0 && static_cast<size_t>(index) < m_icons.size());
+    return m_icons[index];
+}
+
 void AutoFillPopupMenuClient::removeSuggestionAtIndex(unsigned listIndex)
 {
@@ -96 +106 @@
     m_names.remove(index);
     m_labels.remove(index);
+    m_icons.remove(index);
+    m_uniqueIDs.remove(index);
 
     // Shift the separator index if necessary.
@@ -178 +190 @@
 }
 
+String AutoFillPopupMenuClient::itemIcon(unsigned listIndex) const
+{
+    return getIcon(listIndex);
+}
+
 PopupMenuStyle AutoFillPopupMenuClient::itemStyle(unsigned listIndex) const
 {
@@ -250 +267 @@
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
+    const WebVector<WebString>& icons,
     const WebVector<int>& uniqueIDs,
     int separatorIndex)
 {
     ASSERT(names.size() == labels.size());
+    ASSERT(names.size() == icons.size());
     ASSERT(names.size() == uniqueIDs.size());
     ASSERT(separatorIndex < static_cast<int>(names.size()));
@@ -262 +281 @@
     // The suggestions must be set before initializing the
     // AutoFillPopupMenuClient.
-    setSuggestions(names, labels, uniqueIDs, separatorIndex);
+    setSuggestions(names, labels, icons, uniqueIDs, separatorIndex);
 
     FontDescription fontDescription;
@@ -281 +300 @@
 void AutoFillPopupMenuClient::setSuggestions(const WebVector<WebString>& names,
                                              const WebVector<WebString>& labels,
+                                             const WebVector<WebString>& icons,
                                              const WebVector<int>& uniqueIDs,
                                              int separatorIndex)
 {
     ASSERT(names.size() == labels.size());
+    ASSERT(names.size() == icons.size());
     ASSERT(names.size() == uniqueIDs.size());
     ASSERT(separatorIndex < static_cast<int>(names.size()));
@@ -290 +311 @@
     m_names.clear();
     m_labels.clear();
+    m_icons.clear();
     m_uniqueIDs.clear();
     for (size_t i = 0; i < names.size(); ++i) {
         m_names.append(names[i]);
         m_labels.append(labels[i]);
+        m_icons.append(icons[i]);
         m_uniqueIDs.append(uniqueIDs[i]);
     }

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.h

@@ -61 +61 @@
     virtual WebString getLabel(unsigned listIndex) const;
 
+    // Returns the icon at |listIndex|.
+    virtual WebString getIcon(unsigned listIndex) const;
+
     // Removes the suggestion at |listIndex| from the list of suggestions.
     virtual void removeSuggestionAtIndex(unsigned listIndex);
@@ -73 +76 @@
     virtual WebCore::String itemText(unsigned listIndex) const;
     virtual WebCore::String itemLabel(unsigned listIndex) const;
+    virtual WebCore::String itemIcon(unsigned listIndex) const;
     virtual WebCore::String itemToolTip(unsigned lastIndex) const { return WebCore::String(); }
     virtual WebCore::String itemAccessibilityText(unsigned lastIndex) const { return WebCore::String(); }
@@ -101 +105 @@
                     const WebVector<WebString>& names,
                     const WebVector<WebString>& labels,
+                    const WebVector<WebString>& icons,
                     const WebVector<int>& uniqueIDs,
                     int separatorIndex);
@@ -106 +111 @@
     void setSuggestions(const WebVector<WebString>& names,
                         const WebVector<WebString>& labels,
+                        const WebVector<WebString>& icons,
                         const WebVector<int>& uniqueIDs,
                         int separatorIndex);
@@ -125 +131 @@
     void setSelectedIndex(int index) { m_selectedIndex = index; }
 
-    // The names and labels that make up the text of the menu items.
+    // The names, labels and icons that make up the contents of the menu items.
     Vector<WebCore::String> m_names;
     Vector<WebCore::String> m_labels;
+    Vector<WebCore::String> m_icons;
     Vector<int> m_uniqueIDs;
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -1738 +1738 @@
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
+    const WebVector<int>& uniqueIDs,
     int separatorIndex)
 {
-    WebVector<int> uniqueIDs(names.size());
-    applyAutoFillSuggestions(node, names, labels, uniqueIDs, separatorIndex);
+    WebVector<WebString> icons(names.size());
+    applyAutoFillSuggestions(node, names, labels, icons, uniqueIDs, separatorIndex);
 }
 
@@ -1748 +1749 @@
     const WebVector<WebString>& names,
     const WebVector<WebString>& labels,
+    const WebVector<WebString>& icons,
     const WebVector<int>& uniqueIDs,
     int separatorIndex)
@@ -1778 +1780 @@
 
     m_autoFillPopupClient->initialize(
-        inputElem, names, labels, uniqueIDs, separatorIndex);
+        inputElem, names, labels, icons, uniqueIDs, separatorIndex);
 
     if (!m_autoFillPopup.get()) {
@@ -1788 +1790 @@
     if (m_autoFillPopupShowing) {
         m_autoFillPopupClient->setSuggestions(
-            names, labels, uniqueIDs, separatorIndex);
+            names, labels, icons, uniqueIDs, separatorIndex);
         refreshAutoFillPopup();
     } else {
@@ -1810 +1812 @@
     WebVector<WebString> names(suggestions.size());
     WebVector<WebString> labels(suggestions.size());
+    WebVector<WebString> icons(suggestions.size());
     WebVector<int> uniqueIDs(suggestions.size());
 
@@ -1815 +1818 @@
         names[i] = suggestions[i];
 
-    applyAutoFillSuggestions(node, names, labels, uniqueIDs, -1);
+    applyAutoFillSuggestions(node, names, labels, icons, uniqueIDs, -1);
     if (m_autoFillPopupClient)
         m_autoFillPopupClient->setAutocompleteMode(true);

trunk/WebKit/chromium/src/WebViewImpl.h

@@ -172 +172 @@
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
+        const WebVector<int>& uniqueIDs,
         int separatorIndex);
     virtual void applyAutoFillSuggestions(
@@ -177 +178 @@
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
+        const WebVector<WebString>& icons,
         const WebVector<int>& uniqueIDs,
         int separatorIndex);