Changeset 54640 in webkit

Timestamp:

Feb 10, 2010 7:47:38 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-10 James Hawkins <​jhawkins@chromium.org>

Reviewed by Eric Seidel.

[Chromium] Remove code from SuggestionsPopup that was removed in a
previous revision of AutocompletePopup and accidentally added back in
the refactoring.

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

• src/AutoFillPopupMenuClient.cpp:
• src/AutoFillPopupMenuClient.h: Added property svn:eol-style.
• src/SuggestionsPopupMenuClient.cpp: (WebKit::SuggestionsPopupMenuClient::popupDidHide): (WebKit::SuggestionsPopupMenuClient::setTextFromItem): (WebKit::SuggestionsPopupMenuClient::initialize):
• src/SuggestionsPopupMenuClient.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/AutoFillPopupMenuClient.cpp (modified) (1 diff)
• src/AutoFillPopupMenuClient.h (modified) (1 diff)
• src/SuggestionsPopupMenuClient.cpp (modified) (5 diffs)
• src/SuggestionsPopupMenuClient.h (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-10  James Hawkins  <jhawkins@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Remove code from SuggestionsPopup that was removed in a
+        previous revision of AutocompletePopup and accidentally added back in
+        the refactoring.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34818
+
+        * src/AutoFillPopupMenuClient.cpp:
+        * src/AutoFillPopupMenuClient.h: Added property svn:eol-style.
+        * src/SuggestionsPopupMenuClient.cpp:
+        (WebKit::SuggestionsPopupMenuClient::popupDidHide):
+        (WebKit::SuggestionsPopupMenuClient::setTextFromItem):
+        (WebKit::SuggestionsPopupMenuClient::initialize):
+        * src/SuggestionsPopupMenuClient.h:
+
 2010-02-10  Nate Chapin  <japhet@chromium.org>
 

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

@@ -60 +60 @@
 }
 
-void AutoFillPopupMenuClient:: selectionChanged(unsigned listIndex,
-                                                bool fireEvents) {
-    if (listIndex == static_cast<unsigned>(-1)) {
-        SuggestionsPopupMenuClient::selectionChanged(listIndex, fireEvents);
-        return;
-    }
-
-    ASSERT(listIndex >= 0 && listIndex < m_names.size());
-    setSuggestedValue(m_names[listIndex]);
-}
-
 void AutoFillPopupMenuClient::initialize(
     HTMLInputElement* textField,

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.h

@@ -51 +51 @@
     virtual void removeSuggestionAtIndex(unsigned listIndex);
 
-    // WebCore::PopupMenuClient implementation:
-    virtual void selectionChanged(unsigned listIndex, bool fireEvents);
-
     void initialize(WebCore::HTMLInputElement*,
                     const WebVector<WebString>& names,

trunk/WebKit/chromium/src/SuggestionsPopupMenuClient.cpp

@@ -70 +70 @@
 }
 
-void SuggestionsPopupMenuClient::selectionChanged(unsigned listIndex, bool fireEvents)
-{
-    if (listIndex != static_cast<unsigned>(-1)) {
-        const WebString& suggestion = getSuggestion(listIndex);
-        setSuggestedValue(suggestion);
-    } else {
-        m_textField->setValue(m_typedFieldValue);
-        if (m_lastFieldValues->contains(m_textField->name()))
-            m_lastFieldValues->set(m_textField->name(), m_typedFieldValue);
-        else
-            m_lastFieldValues->add(m_textField->name(), m_typedFieldValue);
-    }
-}
-
 String SuggestionsPopupMenuClient::itemText(unsigned listIndex) const
 {
@@ -121 +107 @@
 void SuggestionsPopupMenuClient::popupDidHide()
 {
-    m_textField->setValue(m_typedFieldValue);
-    resetLastSuggestion();
     WebViewImpl* webView = getWebView();
     if (webView)
@@ -131 +115 @@
 {
     m_textField->setValue(getSuggestion(listIndex));
-    resetLastSuggestion();
-}
-
-void SuggestionsPopupMenuClient::resetLastSuggestion()
-{
-    if (m_lastFieldValues->contains(m_textField->name()))
-        m_lastFieldValues->set(m_textField->name(), m_textField->value());
-    else
-        m_lastFieldValues->add(m_textField->name(), m_textField->value());
 }
 
@@ -176 +151 @@
                                             int defaultSuggestionIndex)
 {
-    if (!m_lastFieldValues)
-        m_lastFieldValues.set(new FieldValuesMap);
-
     m_textField = textField;
-    m_typedFieldValue = textField->value();
     m_selectedIndex = defaultSuggestionIndex;
-
-    setInitialSuggestion();
 
     FontDescription fontDescription;
@@ -202 +171 @@
 }
 
-void SuggestionsPopupMenuClient::setInitialSuggestion()
-{
-    if (!getSuggestionsCount() || !m_textField->name().length() || !m_typedFieldValue.length())
-        return;
-
-    int newIndex = m_selectedIndex >= 0 ? m_selectedIndex : 0;
-    const String& suggestion = getSuggestion(newIndex);
-    bool hasPreviousValue = m_lastFieldValues->contains(m_textField->name());
-
-    String prevValue;
-    if (hasPreviousValue)
-        prevValue = m_lastFieldValues->get(m_textField->name());
-
-    if (!hasPreviousValue || m_typedFieldValue.length() > m_lastFieldValues->get(m_textField->name()).length()) {
-        if (suggestion.startsWith(m_typedFieldValue))
-            m_selectedIndex = newIndex;
-
-        int start = 0;
-        String newSuggestion = suggestion;
-        if (suggestion.startsWith(m_typedFieldValue, false)) {
-            newSuggestion = m_typedFieldValue;
-            if (suggestion.length() > m_typedFieldValue.length()) {
-                newSuggestion.append(suggestion.substring(m_typedFieldValue.length(),
-                    suggestion.length() - m_typedFieldValue.length()));
-            }
-            start = m_typedFieldValue.length();
-        }
-
-        m_textField->setSuggestedValue(newSuggestion);
-        m_textField->setSelectionRange(start, newSuggestion.length());
-    }
-
-    if (hasPreviousValue)
-        m_lastFieldValues->set(m_textField->name(), m_typedFieldValue);
-    else
-        m_lastFieldValues->add(m_textField->name(), m_typedFieldValue);
-}
-
-void SuggestionsPopupMenuClient::setSuggestedValue(const WebString& suggestion)
-{
-    m_textField->setSuggestedValue(suggestion);
-    m_textField->setSelectionRange(m_typedFieldValue.length(),
-                                   suggestion.length());
-}
-
 WebViewImpl* SuggestionsPopupMenuClient::getWebView() const
 {

trunk/WebKit/chromium/src/SuggestionsPopupMenuClient.h

@@ -62 +62 @@
     // WebCore::PopupMenuClient methods:
     virtual void valueChanged(unsigned listIndex, bool fireEvents = true);
-    virtual void selectionChanged(unsigned listIndex, bool fireEvents = true);
     virtual WebCore::String itemText(unsigned listIndex) const;
     virtual WebCore::String itemToolTip(unsigned lastIndex) const { return WebCore::String(); }
@@ -91 +90 @@
     void initialize(WebCore::HTMLInputElement* textField,
                     int defaultSuggestionIndex);
-    void setInitialSuggestion();
 
     int getSelectedIndex() const { return m_selectedIndex; }
     void setSelectedIndex(int index) { m_selectedIndex = index; }
-
-    void setSuggestedValue(const WebString& suggestion);
 
     WebViewImpl* getWebView() const;
@@ -103 +99 @@
 private:
     WebCore::RenderStyle* textFieldStyle() const;
-    void resetLastSuggestion();
 
     RefPtr<WebCore::HTMLInputElement> m_textField;
     int m_selectedIndex;
-    WebCore::String m_typedFieldValue;
     OwnPtr<WebCore::PopupMenuStyle> m_style;
-    typedef HashMap<WebCore::String, WebCore::String> FieldValuesMap;
-    OwnPtr<FieldValuesMap> m_lastFieldValues;
 };