From ec4d4d784dbb250e572f8e04d18d0fd2ebeee851 Mon Sep 17 00:00:00 2001 From: benjaminwagner Date: Fri, 25 Mar 2016 12:59:53 -0700 Subject: Change SkTime::GetMSecs to double; ensure values stored in SkMSec do not overflow. The following are currently unused in Android, Google3, Chromium, and Mozilla: - SkEvent - SkTime::GetMSecs - SK_TIME_FACTOR (also unused in Skia) - SkAutoTime I left uses of SkMSec more-or-less intact for SkEvent, SkAnimator, and SkInterpolator. SkInterpolator is used in Chromium, so I did not want to change the API. The views/ and animator/ code is crufty, so it didn't seem worthwhile to refactor it. Instead, I added SkEvent::GetMSecsSinceStartup, which is likely to be adequate for use in SampleApp. I also left SkMSec where it is used to measure a duration rather than a timestamp. With the exception of SkMovie, which is used in Android, all of the uses appear to measure the execution time of a piece of code, which I would hope does not exceed 2^31 milliseconds. Added skiatest::Timer to support a common idiom in tests where we want to measure the wallclock time in integer milliseconds. (Not used in tests/PathOpsSkpClipTest.cpp because it redefines things in Test.h.) Removed tabs in tests/StrokerTest.cpp. BUG=skia:4632 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811613004 Review URL: https://codereview.chromium.org/1811613004 --- tests/Test.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/Test.cpp') diff --git a/tests/Test.cpp b/tests/Test.cpp index f6f2bdab3d..dcb08e6bad 100644 --- a/tests/Test.cpp +++ b/tests/Test.cpp @@ -36,3 +36,17 @@ SkString skiatest::GetTmpDir() { const char* tmpDir = FLAGS_tmpDir.isEmpty() ? nullptr : FLAGS_tmpDir[0]; return SkString(tmpDir); } + +skiatest::Timer::Timer() : fStartNanos(SkTime::GetNSecs()) {} + +double skiatest::Timer::elapsedNs() const { + return SkTime::GetNSecs() - fStartNanos; +} + +double skiatest::Timer::elapsedMs() const { return this->elapsedNs() * 1e-6; } + +SkMSec skiatest::Timer::elapsedMsInt() const { + const double elapsedMs = this->elapsedMs(); + SkASSERT(SK_MSecMax >= elapsedMs); + return static_cast(elapsedMs); +} -- cgit v1.2.3