[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jcivelli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit dd7c3db465de26e6d4d93d6dcad40de84c9575f1
Author: jcivelli at chromium.org <jcivelli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 06:46:45 2010 +0000

    2010-11-22  Jay Civelli  <jcivelli at chromium.org>
    
            Reviewed by David Levin.
    
            Don't create an external popup menu when there are no items to show.
            https://bugs.webkit.org/show_bug.cgi?id=49937
    
            * src/ExternalPopupMenu.cpp:
            (WebKit::ExternalPopupMenu::show):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 17792af..d39c82c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-22  Jay Civelli  <jcivelli at chromium.org>
+
+        Reviewed by David Levin.
+
+        Don't create an external popup menu when there are no items to show.
+        https://bugs.webkit.org/show_bug.cgi?id=49937
+
+        * src/ExternalPopupMenu.cpp:
+        (WebKit::ExternalPopupMenu::show):
+
 2010-11-22  Nat Duca  <nduca at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/ExternalPopupMenu.cpp b/WebKit/chromium/src/ExternalPopupMenu.cpp
index 0f208fb..f7f9862 100644
--- a/WebKit/chromium/src/ExternalPopupMenu.cpp
+++ b/WebKit/chromium/src/ExternalPopupMenu.cpp
@@ -65,6 +65,8 @@ void ExternalPopupMenu::show(const IntRect& rect, FrameView* v, int index)
 
     WebPopupMenuInfo info;
     getPopupMenuInfo(&info);
+    if (info.items.isEmpty())
+        return;
     m_webExternalPopupMenu =
         m_webViewClient->createExternalPopupMenu(info, this);
     m_webExternalPopupMenu->show(v->contentsToWindow(rect));

-- 
WebKit Debian packaging