diff options
author | Steve Block <steveblock@google.com> | 2009-11-20 13:26:23 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-11-20 15:34:54 +0000 |
commit | 716ed672a4274d2a4e960593e02a2cc59a96a82f (patch) | |
tree | ea10c97ec5dcf3e9b083b1f1ebf43e1b2ca53e3d /JavaScriptCore | |
parent | 6f781ac6264a1eb957adc5a410ae350ddeb2a6a2 (diff) | |
download | external_webkit-716ed672a4274d2a4e960593e02a2cc59a96a82f.zip external_webkit-716ed672a4274d2a4e960593e02a2cc59a96a82f.tar.gz external_webkit-716ed672a4274d2a4e960593e02a2cc59a96a82f.tar.bz2 |
Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
This function is an Android addition to JavaScriptCore::WTF, but is not used anywhere in WebCore or JavaScriptCore.
Futhermore, JavaScriptCore/wtf/CurrentTime does not contain any other platform additions.
It's used primarily in WebKit/android/TimeCounter, so I've moved it there.
I've also updated the name to getThreadMsec to match WebKit style.
Change-Id: Ia4f91efd3caaafd1fb079afe6c493aefea402582
Diffstat (limited to 'JavaScriptCore')
-rw-r--r-- | JavaScriptCore/wtf/CurrentTime.cpp | 20 | ||||
-rw-r--r-- | JavaScriptCore/wtf/CurrentTime.h | 4 |
2 files changed, 0 insertions, 24 deletions
diff --git a/JavaScriptCore/wtf/CurrentTime.cpp b/JavaScriptCore/wtf/CurrentTime.cpp index 6751995..b36cae5 100644 --- a/JavaScriptCore/wtf/CurrentTime.cpp +++ b/JavaScriptCore/wtf/CurrentTime.cpp @@ -290,24 +290,4 @@ double currentTime() #endif -#if PLATFORM(ANDROID) - -uint32_t get_thread_msec() -{ -#if defined(HAVE_POSIX_CLOCKS) - struct timespec tm; - - clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tm); - return tm.tv_sec * 1000LL + tm.tv_nsec / 1000000; -#else - struct timeval now; - struct timezone zone; - - gettimeofday(&now, &zone); - return now.tv_sec * 1000LL + now.tv_usec / 1000; -#endif -} - -#endif - } // namespace WTF diff --git a/JavaScriptCore/wtf/CurrentTime.h b/JavaScriptCore/wtf/CurrentTime.h index 436e054..31f1ec8 100644 --- a/JavaScriptCore/wtf/CurrentTime.h +++ b/JavaScriptCore/wtf/CurrentTime.h @@ -39,10 +39,6 @@ namespace WTF { // than a millisecond. double currentTime(); -#if PLATFORM(ANDROID) - uint32_t get_thread_msec(); -#endif - } // namespace WTF using WTF::currentTime; |