[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 037df9cd8e355c618265683a6bfbe7304a4a46fa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 00:33:37 2011 +0000

    2011-01-11  Jeff Miller  <jeffm at apple.com>
    
            Reviewed by John Sullivan.
    
            WebKit2: "Webpages not responding" dialog appears when <select> popup menu is showing
            https://bugs.webkit.org/show_bug.cgi?id=52242
    
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::showPopupMenu):
            On Windows, stop the responsiveness timer before calling showPopupMenu().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75568 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c85b013..0dcbdef 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-11  Jeff Miller  <jeffm at apple.com>
+
+        Reviewed by John Sullivan.
+
+        WebKit2: "Webpages not responding" dialog appears when <select> popup menu is showing
+        https://bugs.webkit.org/show_bug.cgi?id=52242
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::showPopupMenu):
+        On Windows, stop the responsiveness timer before calling showPopupMenu().
+
 2011-01-11  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 19f2ee7..8b8fbe6 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1708,6 +1708,11 @@ void WebPageProxy::showPopupMenu(const IntRect& rect, const Vector<WebPopupItem>
     else
         m_activePopupMenu = m_pageClient->createPopupMenuProxy(this);
 
+#if PLATFORM(WIN)
+    // On Windows, we're about to run our own message pump in showPopupMenu(), so turn off the responsiveness timer.
+    process()->responsivenessTimer()->stop();
+#endif
+
     m_activePopupMenu->showPopupMenu(rect, items, data, selectedIndex);
     m_activePopupMenu = 0;
 }

-- 
WebKit Debian packaging