diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 01:13:40 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 01:13:40 +0000 |
| commit | 3816f46725f7b8e42e352a063efd5206a46dbe9a (patch) | |
| tree | d64edfcf741dcd927ce404f66dab723e8a0914c8 /base/waitable_event_win.cc | |
| parent | bda05798c0609582075a3b872c37ad56021920c4 (diff) | |
| download | chromium_src-3816f46725f7b8e42e352a063efd5206a46dbe9a.zip chromium_src-3816f46725f7b8e42e352a063efd5206a46dbe9a.tar.gz chromium_src-3816f46725f7b8e42e352a063efd5206a46dbe9a.tar.bz2 | |
rollback r1075 to see if it helps resolve test failures
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/waitable_event_win.cc')
| -rw-r--r-- | base/waitable_event_win.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/base/waitable_event_win.cc b/base/waitable_event_win.cc index e23eea0..da2d2d8 100644 --- a/base/waitable_event_win.cc +++ b/base/waitable_event_win.cc @@ -29,7 +29,6 @@ #include "base/waitable_event.h" -#include <math.h> #include <windows.h> #include "base/logging.h" @@ -69,12 +68,8 @@ bool WaitableEvent::Wait() { } bool WaitableEvent::TimedWait(const TimeDelta& max_time) { - DCHECK(max_time >= TimeDelta::FromMicroseconds(0)); - // Be careful here. TimeDelta has a precision of microseconds, but this API - // is in milliseconds. If there are 5.5ms left, should the delay be 5 or 6? - // It should be 6 to avoid returning too early. - double timeout = ceil(max_time.InMillisecondsF()); - DWORD result = WaitForSingleObject(event_, static_cast<DWORD>(timeout)); + int32 timeout = static_cast<int32>(max_time.InMilliseconds()); + DWORD result = WaitForSingleObject(event_, timeout); switch (result) { case WAIT_OBJECT_0: return true; |