[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7899df5fe70c8aedeb3546991daaf4050cf803f3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 16:23:06 2009 +0000

    2009-09-25  Paul Godavari  <paul at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Fix a regression in Mac Chromium popup menus, where the user's
            selection was ignored and the popup became unresponsive.
            https://bugs.webkit.org/show_bug.cgi?id=29726
    
            The fix is to notify the popup's client that the popup was hidden,
            even if the popup has no parent.
    
            * platform/chromium/PopupMenuChromium.cpp:
            (WebCore::PopupListBox::hidePopup):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48757 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5082ad1..f2fbeed 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-25  Paul Godavari  <paul at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Fix a regression in Mac Chromium popup menus, where the user's
+        selection was ignored and the popup became unresponsive.
+        https://bugs.webkit.org/show_bug.cgi?id=29726
+
+        The fix is to notify the popup's client that the popup was hidden,
+        even if the popup has no parent.
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::hidePopup):
+
 2009-09-25  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index c248cd5..2f69eaf 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -1057,12 +1057,11 @@ void PopupListBox::adjustSelectedIndex(int delta)
 
 void PopupListBox::hidePopup()
 {
-    if (!parent())
-        return;
-
-    PopupContainer* container = static_cast<PopupContainer*>(parent());
-    if (container->client())
-        container->client()->popupClosed(container);
+    if (parent()) {
+        PopupContainer* container = static_cast<PopupContainer*>(parent());
+        if (container->client())
+            container->client()->popupClosed(container);
+    }
 
     m_popupClient->popupDidHide();
 }

-- 
WebKit Debian packaging