aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2015-10-22 13:03:02 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-22 13:03:02 -0700
commit6ae30fbbafe9aa9596922ac96ecaae0278b7be65 (patch)
treec2944e2bc22e8b64ad07dc9b6e9275a0c52dedf6 /include/core
parent70084cbc16ee8162649f2601377feb6e49de0217 (diff)
Revert of SkTime::GetNSecs() (patchset #9 id:160001 of https://codereview.chromium.org/1422513003/ )
Reason for revert: broke chromeos Original issue's description: > 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 TBR=reed@google.com,mtklein@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1420923003
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkTime.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/core/SkTime.h b/include/core/SkTime.h
index 2cfe3efcb4..a8656347aa 100644
--- a/include/core/SkTime.h
+++ b/include/core/SkTime.h
@@ -34,8 +34,7 @@ public:
};
static void GetDateTime(DateTime*);
- static SkMSec GetMSecs() { return (SkMSec)(GetNSecs() * 1e-6); }
- static double GetNSecs();
+ static SkMSec GetMSecs();
};
#if defined(SK_DEBUG) && defined(SK_BUILD_FOR_WIN32)