[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
aroben at apple.com
aroben at apple.com
Wed Jan 20 22:12:58 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 97b712a82c0a9c9c93c2bdefa35fdd51cec57b67
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
More information about the Pkg-webkit-commits
mailing list