Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1314)

Unified Diff: base/time_posix.cc

Issue 11363114: Update Time and TimeTicks for NaCl now that it has CLOCK_MONOTONIC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/time_posix.cc
===================================================================
--- base/time_posix.cc (revision 166155)
+++ base/time_posix.cc (working copy)
@@ -193,7 +193,7 @@
// TimeTicks ------------------------------------------------------------------
// FreeBSD 6 has CLOCK_MONOLITHIC but defines _POSIX_MONOTONIC_CLOCK to -1.
-#if (defined(OS_POSIX) && !defined(OS_NACL) && \
+#if (defined(OS_POSIX) && \
defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \
defined(OS_BSD) || defined(OS_ANDROID)
@@ -213,16 +213,6 @@
return TimeTicks(absolute_micro);
}
-
-#elif defined(OS_NACL)
-
-TimeTicks TimeTicks::Now() {
- // Sadly, Native Client does not have _POSIX_TIMERS enabled in sys/features.h
- // Apparently NaCl only has CLOCK_REALTIME:
- // http://code.google.com/p/nativeclient/issues/detail?id=1159
- return TimeTicks(clock());
-}
-
#else // _POSIX_MONOTONIC_CLOCK
#error No usable tick clock function on this platform.
#endif // _POSIX_MONOTONIC_CLOCK
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698