diff options
author | 2016-03-25 12:59:53 -0700 | |
---|---|---|
committer | 2016-03-25 12:59:53 -0700 | |
commit | ec4d4d784dbb250e572f8e04d18d0fd2ebeee851 (patch) | |
tree | 444d5b0c8e1a54286d9adfc75fbc7d7e27b82fa3 /src/views/SkTouchGesture.cpp | |
parent | 9cf31f40fb5df6b6b914e087394c40b8303e5e32 (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/SkTouchGesture.cpp')
-rw-r--r-- | src/views/SkTouchGesture.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp index 22c9434216..676f8e9a64 100644 --- a/src/views/SkTouchGesture.cpp +++ b/src/views/SkTouchGesture.cpp @@ -115,7 +115,7 @@ void SkTouchGesture::reset() { fLocalM.reset(); fGlobalM.reset(); - fLastUpT = SkTime::GetMSecs() - 2*MAX_DBL_TAP_INTERVAL; + fLastUpMillis = SkTime::GetMSecs() - 2*MAX_DBL_TAP_INTERVAL; fLastUpP.set(0, 0); } @@ -138,7 +138,7 @@ void SkTouchGesture::appendNewRec(void* owner, float x, float y) { rec->fOwner = owner; rec->fStartX = rec->fPrevX = rec->fLastX = x; rec->fStartY = rec->fPrevY = rec->fLastY = y; - rec->fLastT = rec->fPrevT = SkTime::GetMSecs(); + rec->fLastT = rec->fPrevT = static_cast<float>(SkTime::GetSecs()); } void SkTouchGesture::touchBegin(void* owner, float x, float y) { @@ -227,7 +227,8 @@ void SkTouchGesture::touchMoved(void* owner, float x, float y) { rec.fPrevX = rec.fLastX; rec.fLastX = x; rec.fPrevY = rec.fLastY; rec.fLastY = y; - rec.fPrevT = rec.fLastT; rec.fLastT = SkTime::GetMSecs(); + rec.fPrevT = rec.fLastT; + rec.fLastT = static_cast<float>(SkTime::GetSecs()); switch (fTouches.count()) { case 1: { @@ -276,7 +277,7 @@ void SkTouchGesture::touchEnd(void* owner) { this->flushLocalM(); float dx = rec.fLastX - rec.fPrevX; float dy = rec.fLastY - rec.fPrevY; - float dur = (rec.fLastT - rec.fPrevT) * 0.001f; + float dur = rec.fLastT - rec.fPrevT; if (dur > 0) { fFlinger.reset(dx / dur, dy / dur); } @@ -310,8 +311,8 @@ float SkTouchGesture::computePinch(const Rec& rec0, const Rec& rec1) { bool SkTouchGesture::handleDblTap(float x, float y) { bool found = false; - SkMSec now = SkTime::GetMSecs(); - if (now - fLastUpT <= MAX_DBL_TAP_INTERVAL) { + double now = SkTime::GetMSecs(); + if (now - fLastUpMillis <= MAX_DBL_TAP_INTERVAL) { if (SkPoint::Length(fLastUpP.fX - x, fLastUpP.fY - y) <= MAX_DBL_TAP_DISTANCE) { fFlinger.stop(); @@ -323,7 +324,7 @@ bool SkTouchGesture::handleDblTap(float x, float y) { } } - fLastUpT = now; + fLastUpMillis = now; fLastUpP.set(x, y); return found; } |