Index: src/views/SkTouchGesture.cpp |
diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp |
index 22c9434216bfae9fb781c7bf8d267acaf6523422..676f8e9a64b33e67ed4c034fba9e0bea59597e73 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; |
} |