[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3f8145c85eeeb84764a357ead0d5f820b28de4f1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 22:50:55 2010 +0000

    2010-02-19  James Hawkins  <jhawkins at chromium.org>
    
            Reviewed by Eric Seidel.
    
            [Chromium] Use the m_suggestionsPopupClient pointer to refer to the
            popup client, as the Autocomplete popup might not be the current
            popup.
    
            https://bugs.webkit.org/show_bug.cgi?id=35172
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::autocompleteHandleKeyEvent):
            (WebKit::WebViewImpl::refreshSuggestionsPopup):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55032 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 18deb21..245cd9e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Eric Seidel.
 
+        [Chromium] Use the m_suggestionsPopupClient pointer to refer to the
+        popup client, as the Autocomplete popup might not be the current
+        popup.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35172
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::autocompleteHandleKeyEvent):
+        (WebKit::WebViewImpl::refreshSuggestionsPopup):
+
+2010-02-19  James Hawkins  <jhawkins at chromium.org>
+
+        Reviewed by Eric Seidel.
+
         [Chromium] Rename EditorClientImpl::onAutofillSuggestionAccepted to
         onAutocompleteSuggestionAccepted to better match the purpose of the
         function.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index ce03523..97665d4 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -540,11 +540,11 @@ bool WebViewImpl::autocompleteHandleKeyEvent(const WebKeyboardEvent& event)
         int selectedIndex = m_suggestionsPopup->selectedIndex();
         HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(element);
         WebString name = inputElement->name();
-        WebString value = m_autocompletePopupClient->itemText(selectedIndex);
+        WebString value = m_suggestionsPopupClient->itemText(selectedIndex);
         m_client->removeAutofillSuggestions(name, value);
         // Update the entries in the currently showing popup to reflect the
         // deletion.
-        m_autocompletePopupClient->removeSuggestionAtIndex(selectedIndex);
+        m_suggestionsPopupClient->removeSuggestionAtIndex(selectedIndex);
         refreshSuggestionsPopup();
         return false;
     }
@@ -1871,7 +1871,7 @@ void WebViewImpl::refreshSuggestionsPopup()
     ASSERT(m_suggestionsPopupShowing);
 
     // Hide the popup if it has become empty.
-    if (!m_autocompletePopupClient->listSize()) {
+    if (!m_suggestionsPopupClient->listSize()) {
         hideSuggestionsPopup();
         return;
     }

-- 
WebKit Debian packaging