diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/win/SystemTimeWin.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/win/SystemTimeWin.cpp')
| -rw-r--r-- | Source/WebCore/platform/win/SystemTimeWin.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/WebCore/platform/win/SystemTimeWin.cpp b/Source/WebCore/platform/win/SystemTimeWin.cpp index 451262d..547decc 100644 --- a/Source/WebCore/platform/win/SystemTimeWin.cpp +++ b/Source/WebCore/platform/win/SystemTimeWin.cpp @@ -26,13 +26,9 @@ #include "config.h" #include "SystemTime.h" +#include <limits> #include <windows.h> -#if COMPILER(MINGW) || (PLATFORM(QT) && COMPILER(MSVC)) -#include <float.h> -#define FLOAT_MAX FLT_MAX -#endif - namespace WebCore { float userIdleTime() @@ -43,7 +39,8 @@ float userIdleTime() if (::GetLastInputInfo(&lastInputInfo)) return (GetTickCount() - lastInputInfo.dwTime) * 0.001; // ::GetTickCount returns ms of uptime valid for up to 49.7 days. #endif - return FLT_MAX; // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed. + // Return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed. + return std::numeric_limits<float>::max(); } -} +} // namespace WebCore |