diff options
| author |  mtklein <mtklein@chromium.org> | 2015-10-23 07:02:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-23 07:02:06 -0700 |
| commit | 33eefcd58bffc35355382dd7b1b79a02b99f8c6c (patch) | |
| tree | bcf4043e0b109154d9d5ae2deabe2a205880762d /src/animator | |
| parent | 3b5b7845428a94402c1984c175ecce83cc963c21 (diff) | |
SkTime::GetNSecs()
- Move high-precision wall timers from tools/timer to SkTime.
- Implement SkTime::GetMSecs() in terms of SkTime::GetNSecs().
- Delete unused tools/timer code.
I have no idea what's going on there in src/animator.
I don't intend to investigate.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/70084cbc16ee8162649f2601377feb6e49de0217
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link-Trybot
Committed: https://skia.googlesource.com/skia/+/a1840d50e29fd95e4df2d1168fe54c34c2a5c30c
Committed: https://skia.googlesource.com/skia/+/38a88e4c0c28a7be981aac7bb4a198ad95a62a63
Review URL: https://codereview.chromium.org/1422513003
Diffstat (limited to 'src/animator')
| -rw-r--r-- | src/animator/SkTime.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/animator/SkTime.cpp b/src/animator/SkTime.cpp index a4e035bd1e..560ccd2fc8 100644 --- a/src/animator/SkTime.cpp +++ b/src/animator/SkTime.cpp @@ -28,15 +28,6 @@ void SkTime::GetDateTime(DateTime* t) { } } -SkMSec SkTime::GetMSecs() { -#ifdef SK_DEBUG - if (gForceTickCount != (SkMSec) -1) { - return gForceTickCount; - } -#endif - return ::GetTickCount(); -} - #elif defined(xSK_BUILD_FOR_MAC) #include <time.h> @@ -58,13 +49,4 @@ void SkTime::GetDateTime(DateTime* t) { } } -SkMSec SkTime::GetMSecs() { - UnsignedWide wide; - ::Microseconds(&wide); - - int64_t s = ((int64_t)wide.hi << 32) | wide.lo; - s = (s + 500) / 1000; // rounded divide - return (SkMSec)s; -} - #endif |