Changeset 72001 in webkit

Timestamp:

Nov 15, 2010 3:37:21 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-15 Ilya Sherman <​isherman@chromium.org>

Reviewed by Kent Tamura.

Add capability for displaying warnings to autofill popup
Warnings are displayed in dark gray italic.
​https://bugs.webkit.org/show_bug.cgi?id=49291
​http://code.google.com/p/chromium/issues/detail?id=58509

• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::getRowFont): Use item-specific font, not just the generic menu font. (WebCore::PopupListBox::selectIndex): Updated to clear the selection when hovering over a non-selectable item.
• platform/chromium/PopupMenuChromium.h: Minor cleanup

2010-11-15 Ilya Sherman <​isherman@chromium.org>

Reviewed by Kent Tamura.

Add capability for displaying warnings to autofill popup
Warnings are displayed in dark gray italic.
​https://bugs.webkit.org/show_bug.cgi?id=49291
​http://code.google.com/p/chromium/issues/detail?id=58509

• src/AutoFillPopupMenuClient.cpp: (WebKit::AutoFillPopupMenuClient::canRemoveSuggestionAtIndex): Updated logic -- can only remove Autocomplete suggestions, which have unique ID 0. (WebKit::AutoFillPopupMenuClient::itemIsEnabled): False for warnings. (WebKit::AutoFillPopupMenuClient::itemStyle): Dark gray italic for warnings. (WebKit::AutoFillPopupMenuClient::menuStyle): Variable name changed. (WebKit::AutoFillPopupMenuClient::itemIsWarning): True for unique ID < 0. (WebKit::AutoFillPopupMenuClient::initialize): Updated cached styles (see above).
• src/AutoFillPopupMenuClient.h: Added itemIsEnabled(), variable to cache warning style.
• src/WebViewImpl.cpp: Minor cleanup. (WebKit::WebViewImpl::applyAutoFillSuggestions):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (4 diffs)
• WebCore/platform/chromium/PopupMenuChromium.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebView.h (modified) (1 diff)
• WebKit/chromium/public/WebViewClient.h (modified) (1 diff)
• WebKit/chromium/src/AutoFillPopupMenuClient.cpp (modified) (4 diffs)
• WebKit/chromium/src/AutoFillPopupMenuClient.h (modified) (3 diffs)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-15  Ilya Sherman  <isherman@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Add capability for displaying warnings to autofill popup
+        Warnings are displayed in dark gray italic.
+        https://bugs.webkit.org/show_bug.cgi?id=49291
+        http://code.google.com/p/chromium/issues/detail?id=58509
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::getRowFont):
+          Use item-specific font, not just the generic menu font.
+        (WebCore::PopupListBox::selectIndex):
+          Updated to clear the selection when hovering over a non-selectable item.
+        * platform/chromium/PopupMenuChromium.h: Minor cleanup
+
 2010-11-14  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -50 +50 @@
 #include "PlatformScreen.h"
 #include "PlatformWheelEvent.h"
+#include "PopupMenuClient.h"
 #include "RenderTheme.h"
 #include "ScrollbarTheme.h"
@@ -992 +993 @@
 Font PopupListBox::getRowFont(int rowIndex)
 {
-    Font itemFont = m_popupClient->menuStyle().font();
+    Font itemFont = m_popupClient->itemStyle(rowIndex).font();
     if (m_popupClient->itemIsLabel(rowIndex)) {
         // Bold-ify labels (ie, an <optgroup> heading).
@@ -1070 +1071 @@
         return;
 
-    if (index != m_selectedIndex && isSelectableItem(index)) {
+    bool isSelectable = isSelectableItem(index);
+    if (index != m_selectedIndex && isSelectable) {
         invalidateRow(m_selectedIndex);
         m_selectedIndex = index;
@@ -1077 +1079 @@
         scrollToRevealSelection();
         m_popupClient->selectionChanged(m_selectedIndex);
+    } else if (!isSelectable) {
+        clearSelection();
     }
 }

trunk/WebCore/platform/chromium/PopupMenuChromium.h

@@ -33 +33 @@
 
 #include "config.h"
-#include "PopupMenuClient.h"
 
 #include "FramelessScrollView.h"
 #include "IntRect.h"
+#include "PlatformString.h"
 #include "PopupMenu.h"
 #include "PopupMenuPrivate.h"
+#include "PopupMenuStyle.h"
 
 namespace WebCore {
@@ -45 +46 @@
 class FrameView;
 class PopupListBox;
+class PopupMenuClient;
 
 // A container for the data for each menu item (e.g. represented by <option>

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-11-15  Ilya Sherman  <isherman@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Add capability for displaying warnings to autofill popup
+        Warnings are displayed in dark gray italic.
+        https://bugs.webkit.org/show_bug.cgi?id=49291
+        http://code.google.com/p/chromium/issues/detail?id=58509
+
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::canRemoveSuggestionAtIndex):
+          Updated logic -- can only remove Autocomplete suggestions, which have unique ID 0.
+        (WebKit::AutoFillPopupMenuClient::itemIsEnabled): False for warnings.
+        (WebKit::AutoFillPopupMenuClient::itemStyle): Dark gray italic for warnings.
+        (WebKit::AutoFillPopupMenuClient::menuStyle): Variable name changed.
+        (WebKit::AutoFillPopupMenuClient::itemIsWarning): True for unique ID < 0.
+        (WebKit::AutoFillPopupMenuClient::initialize): Updated cached styles (see above).
+        * src/AutoFillPopupMenuClient.h: Added itemIsEnabled(), variable to cache warning style.
+        * src/WebViewImpl.cpp: Minor cleanup.
+        (WebKit::WebViewImpl::applyAutoFillSuggestions): 
+
 2010-11-14  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKit/chromium/public/WebView.h

@@ -290 +290 @@
     // 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.
+    // 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
+    // unavailable for the current form.
     virtual void applyAutoFillSuggestions(
         const WebNode&,

trunk/WebKit/chromium/public/WebViewClient.h

@@ -310 +310 @@
 
     // 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.  |index| is an index of the selected suggestion in the list of
-    // suggestions provided by the client
+    // 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&,
-                                             const WebString& name,
+                                             const WebString& value,
                                              const WebString& label,
                                              int uniqueID,

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

@@ -116 +116 @@
 bool AutoFillPopupMenuClient::canRemoveSuggestionAtIndex(unsigned listIndex)
 {
-    // Only allow deletion of items before the separator and those that don't
-    // have a label (autocomplete).
-    int index = convertListIndexToInternalIndex(listIndex);
-    return m_labels[index].isEmpty() && (m_separatorIndex == -1 || listIndex < static_cast<unsigned>(m_separatorIndex));
+    // Only allow deletion of items before the separator that have unique id 0
+    // (i.e. are autocomplete rather than autofill items).
+    int index = convertListIndexToInternalIndex(listIndex);
+    return !m_uniqueIDs[index] && (m_separatorIndex == -1 || listIndex < static_cast<unsigned>(m_separatorIndex));
 }
 
@@ -195 +195 @@
 }
 
+bool AutoFillPopupMenuClient::itemIsEnabled(unsigned listIndex) const
+{
+    return !itemIsWarning(listIndex);
+}
+
 PopupMenuStyle AutoFillPopupMenuClient::itemStyle(unsigned listIndex) const
 {
-    return *m_style;
+    return itemIsWarning(listIndex) ? *m_warningStyle : *m_regularStyle;
 }
 
 PopupMenuStyle AutoFillPopupMenuClient::menuStyle() const
 {
-    return *m_style;
+    return *m_regularStyle;
 }
 
@@ -238 +243 @@
 {
     return (m_separatorIndex != -1 && static_cast<unsigned>(m_separatorIndex) == listIndex);
+}
+
+bool AutoFillPopupMenuClient::itemIsWarning(unsigned listIndex) const
+{
+    int index = convertListIndexToInternalIndex(listIndex);
+    if (index == -1)
+        return false;
+
+    ASSERT(index >= 0 && static_cast<size_t>(index) < m_uniqueIDs.size());
+    return m_uniqueIDs[index] < 0;
 }
 
@@ -283 +298 @@
     setSuggestions(names, labels, icons, uniqueIDs, separatorIndex);
 
-    FontDescription fontDescription;
+    FontDescription regularFontDescription;
     RenderTheme::defaultTheme()->systemFont(CSSValueWebkitControl,
-                                            fontDescription);
+                                            regularFontDescription);
     RenderStyle* style = m_textField->computedStyle();
-    fontDescription.setComputedSize(style->fontDescription().computedSize());
-
-    Font font(fontDescription, 0, 0);
-    font.update(textField->document()->styleSelector()->fontSelector());
+    regularFontDescription.setComputedSize(style->fontDescription().computedSize());
+
+    Font regularFont(regularFontDescription, 0, 0);
+    regularFont.update(textField->document()->styleSelector()->fontSelector());
     // The direction of text in popup menu is set the same as the direction of
     // the input element: textField.
-    m_style.set(new PopupMenuStyle(Color::black, Color::white, font, true,
-                                   false, Length(WebCore::Fixed),
-                                   textField->renderer()->style()->direction()));
+    m_regularStyle.set(new PopupMenuStyle(Color::black, Color::white, regularFont,
+                                          true, false, Length(WebCore::Fixed),
+                                          textField->renderer()->style()->direction()));
+
+    FontDescription warningFontDescription = regularFont.fontDescription();
+    warningFontDescription.setItalic(true);
+    Font warningFont(warningFontDescription, regularFont.letterSpacing(), regularFont.wordSpacing());
+    warningFont.update(regularFont.fontSelector());
+    m_warningStyle.set(new PopupMenuStyle(Color::darkGray,
+                                          m_regularStyle->backgroundColor(),
+                                          warningFont,
+                                          m_regularStyle->isVisible(),
+                                          m_regularStyle->isDisplayNone(),
+                                          m_regularStyle->textIndent(),
+                                          m_regularStyle->textDirection()));
 }
 

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.h

@@ -79 +79 @@
     virtual WTF::String itemToolTip(unsigned lastIndex) const { return WTF::String(); }
     virtual WTF::String itemAccessibilityText(unsigned lastIndex) const { return WTF::String(); }
-    virtual bool itemIsEnabled(unsigned listIndex) const { return true; }
+    virtual bool itemIsEnabled(unsigned listIndex) const;
     virtual WebCore::PopupMenuStyle itemStyle(unsigned listIndex) const;
     virtual WebCore::PopupMenuStyle menuStyle() const;
@@ -131 +131 @@
     void setSelectedIndex(int index) { m_selectedIndex = index; }
 
+    bool itemIsWarning(unsigned listIndex) const;
+
     // The names, labels and icons that make up the contents of the menu items.
     Vector<WTF::String> m_names;
@@ -144 +146 @@
 
     RefPtr<WebCore::HTMLInputElement> m_textField;
-    OwnPtr<WebCore::PopupMenuStyle> m_style;
+    OwnPtr<WebCore::PopupMenuStyle> m_regularStyle;
+    OwnPtr<WebCore::PopupMenuStyle> m_warningStyle;
 
     // DEPRECATED: Will be removed once Autocomplete and AutoFill merge is

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -179 +179 @@
     true,  // loopSelectionNavigation
     false, // restrictWidthOfListBox (For security reasons show the entire entry
-           // so the user doesn't enter information it did not intend to.)
+           // so the user doesn't enter information he did not intend to.)
     // For suggestions, we use the direction of the input field as the direction
     // of the popup items. The main reason is to keep the display of items in
@@ -1944 +1944 @@
 
     if (m_autoFillPopupShowing) {
-        m_autoFillPopupClient->setSuggestions(
-            names, labels, icons, uniqueIDs, separatorIndex);
         refreshAutoFillPopup();
     } else {
-        m_autoFillPopup->show(focusedNode->getRect(),
-                                 focusedNode->ownerDocument()->view(), 0);
+        m_autoFillPopup->show(focusedNode->getRect(), focusedNode->ownerDocument()->view(), 0);
         m_autoFillPopupShowing = true;
     }