[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2a8e80b46fb26a90d2517a54eed6085f7e590e1b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 01:22:46 2010 +0000

    2010-01-11  Victor Wang  <victorw at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Clear m_acceptedIndexOnAbandon flag when user accepts the selected index.
    
            https://bugs.webkit.org/show_bug.cgi?id=33499
    
            TEST: manual-tests/chromium/onchange-reload-popup.html
            It should be covered by the above test. The current
            test shell does not support sending keyboard events to popup
            list so use manual test for it.
    
            * platform/chromium/PopupMenuChromium.cpp:
            (WebCore::PopupListBox::acceptIndex):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1edc325..9ae4115 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-11  Victor Wang  <victorw at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Clear m_acceptedIndexOnAbandon flag when user accepts the selected index.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33499
+
+        TEST: manual-tests/chromium/onchange-reload-popup.html
+        It should be covered by the above test. The current
+        test shell does not support sending keyboard events to popup
+        list so use manual test for it.
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::acceptIndex):
+
 2010-01-11  Gustavo Noronha Silva  <gns at gnome.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index b1f8f3b..d813ec7 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -911,6 +911,10 @@ int PopupListBox::pointToRowIndex(const IntPoint& point)
 
 void PopupListBox::acceptIndex(int index)
 {
+    // Clear m_acceptedIndexOnAbandon once user accepts the selected index.
+    if (m_acceptedIndexOnAbandon >= 0)
+        m_acceptedIndexOnAbandon = -1;
+
     if (index >= numItems())
         return;
 

-- 
WebKit Debian packaging