aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/views/SkEvent.cpp
diff options
context:
space:
mode:
authorGravatar benjaminwagner <benjaminwagner@google.com>2016-03-25 12:59:53 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-25 12:59:53 -0700
commitec4d4d784dbb250e572f8e04d18d0fd2ebeee851 (patch)
tree444d5b0c8e1a54286d9adfc75fbc7d7e27b82fa3 /src/views/SkEvent.cpp
parent9cf31f40fb5df6b6b914e087394c40b8303e5e32 (diff)
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
Diffstat (limited to 'src/views/SkEvent.cpp')
-rw-r--r--src/views/SkEvent.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/views/SkEvent.cpp b/src/views/SkEvent.cpp
index 5316b49a1d..b90d03f3d0 100644
--- a/src/views/SkEvent.cpp
+++ b/src/views/SkEvent.cpp
@@ -298,7 +298,7 @@ void SkEvent::postDelay(SkMSec delay) {
}
if (delay) {
- this->postTime(SkTime::GetMSecs() + delay);
+ this->postTime(GetMSecsSinceStartup() + delay);
return;
}
@@ -404,7 +404,7 @@ SkMSec SkEvent::EnqueueTime(SkEvent* evt, SkMSec time) {
prev->fNextEvent = evt;
}
- SkMSec delay = globals.fDelayQHead->fTime - SkTime::GetMSecs();
+ SkMSec delay = globals.fDelayQHead->fTime - GetMSecsSinceStartup();
if ((int32_t)delay <= 0) {
delay = 1;
}
@@ -436,7 +436,7 @@ void SkEvent::ServiceQueueTimer()
globals.fEventMutex.acquire();
bool wasEmpty = false;
- SkMSec now = SkTime::GetMSecs();
+ SkMSec now = GetMSecsSinceStartup();
SkEvent* evt = globals.fDelayQHead;
while (evt)
@@ -485,6 +485,11 @@ int SkEvent::CountEventsOnQueue() {
return count;
}
+SkMSec SkEvent::GetMSecsSinceStartup() {
+ static const double kEpoch = SkTime::GetMSecs();
+ return static_cast<SkMSec>(SkTime::GetMSecs() - kEpoch);
+}
+
///////////////////////////////////////////////////////////////////////////////
void SkEvent::Init() {}