diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 19:13:50 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 19:13:50 +0000 |
| commit | 31c7e3b5078faa1d42d8f895f18f408887a8f570 (patch) | |
| tree | 1535d03f9ab178196ac7a4bb2e1a987851425af5 /chrome_frame | |
| parent | d9514c1521f6a4b1bdba2eddfb8083a0a1d22be4 (diff) | |
| download | chromium_src-31c7e3b5078faa1d42d8f895f18f408887a8f570.zip chromium_src-31c7e3b5078faa1d42d8f895f18f408887a8f570.tar.gz chromium_src-31c7e3b5078faa1d42d8f895f18f408887a8f570.tar.bz2 | |
Clean up code in the ChromeFrame test COM message filter by detecting whether IE is hung in the WM_TIMER handler, instead
of peeking with PM_NOREMOVE to detect the same.
BUG=none
TEST=ChromeFrame tests.
TBR=amit
Review URL: http://codereview.chromium.org/6693086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 82fddb2..781ba7f 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -141,8 +141,7 @@ class HungCOMCallDetector DWORD tick_count, DWORD pending_type) { MSG msg = {0}; - if (PeekMessage(&msg, m_hWnd, WM_TIMER, WM_TIMER, PM_NOREMOVE)) { - is_hung_ = true; + if (is_hung_) { return PENDINGMSG_CANCELCALL; } return PENDINGMSG_WAITDEFPROCESS; @@ -153,6 +152,7 @@ class HungCOMCallDetector } LRESULT OnTimer(UINT msg, WPARAM wp, LPARAM lp, BOOL& handled) { // NOLINT + is_hung_ = true; return 1; } @@ -176,7 +176,7 @@ class HungCOMCallDetector } static const int kHungDetectTimerId = 0x0000baba; - SetTimer(kHungDetectTimerId, 1000 * (timeout_seconds + 20), NULL); + SetTimer(kHungDetectTimerId, 1000 * (timeout_seconds + 40), NULL); return S_OK; } |