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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 256c586a49f9e00068020260cf1dd27deb61401b
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 18:14:35 2010 +0000

    Don't hang in WebKitAPITest if no messages have been posted
    
    Part of <http://webkit.org/b/33212> Small fixes/improvements to
    WebKitAPITest
    
    Reviewed by Sam Weinig.
    
    * WebKitAPITest/tests/WebViewDestruction.cpp:
    (WebKitAPITest::runMessagePump): Use PeekMessage instead of GetMessage
    to avoid hanging if no messages have been posted.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 34cdc85..3528856 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
 2010-01-05  Adam Roben  <aroben at apple.com>
 
+        Don't hang in WebKitAPITest if no messages have been posted
+
+        Part of <http://webkit.org/b/33212> Small fixes/improvements to
+        WebKitAPITest
+
+        Reviewed by Sam Weinig.
+
+        * WebKitAPITest/tests/WebViewDestruction.cpp:
+        (WebKitAPITest::runMessagePump): Use PeekMessage instead of GetMessage
+        to avoid hanging if no messages have been posted.
+
+2010-01-05  Adam Roben  <aroben at apple.com>
+
         Fix WebKitCreateInstance helper
 
         Part of <http://webkit.org/b/33212> Small fixes/improvements to
diff --git a/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp b/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp
index 928dda5..53f4eb4 100644
--- a/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp
+++ b/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp
@@ -68,7 +68,7 @@ static void runMessagePump(DWORD timeoutMilliseconds)
     DWORD startTickCount = GetTickCount();
     MSG msg;
     BOOL result;
-    while ((result = GetMessage(&msg, 0, 0, 0)) && GetTickCount() - startTickCount <= timeoutMilliseconds) {
+    while ((result = PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) && GetTickCount() - startTickCount <= timeoutMilliseconds) {
         if (result == -1)
             break;
         TranslateMessage(&msg);

-- 
WebKit Debian packaging