Change SkTime::GetMSecs to double; ensure values stored in SkMSec do not overflow.

src/views/SkTouchGesture.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 97 matching lines @@
 
 SkTouchGesture::~SkTouchGesture() {
 }
 
 void SkTouchGesture::reset() {
     fTouches.reset();
     fState = kEmpty_State;
     fLocalM.reset();
     fGlobalM.reset();
 
-    fLastUpT = SkTime::GetMSecs() - 2*MAX_DBL_TAP_INTERVAL;
+    fLastUpMillis = SkTime::GetMSecs() - 2*MAX_DBL_TAP_INTERVAL;
     fLastUpP.set(0, 0);
 }
 
 void SkTouchGesture::flushLocalM() {
     fGlobalM.postConcat(fLocalM);
     fLocalM.reset();
 }
 
 const SkMatrix& SkTouchGesture::localM() {
     if (fFlinger.isActive()) {
         if (!fFlinger.evaluateMatrix(&fLocalM)) {
             this->flushLocalM();
         }
     }
     return fLocalM;
 }
 
 void SkTouchGesture::appendNewRec(void* owner, float x, float y) {
     Rec* rec = fTouches.append();
     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) {
 //    SkDebugf("--- %d touchBegin %p %g %g\n", fTouches.count(), owner, x, y);
 
     int index = this->findRec(owner);
     if (index >= 0) {
         this->flushLocalM();
         fTouches.removeShuffle(index);
         SkDebugf("---- already exists, removing\n");
@@ skipping 68 matching lines @@
     // not sure how valuable this is
     if (fTouches.count() == 2) {
         if (close_enough_for_jitter(rec.fLastX, rec.fLastY, x, y)) {
 //            SkDebugf("--- drop touchMove, withing jitter tolerance %g %g\n", rec.fLastX - x, rec.fLastY - y);
             return;
         }
     }
 
     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: {
             float dx = rec.fLastX - rec.fStartX;
             float dy = rec.fLastY - rec.fStartY;
             dx = (float)sk_float_round2int(dx);
             dy = (float)sk_float_round2int(dy);
             fLocalM.setTranslate(dx, dy);
         } break;
         case 2: {
@@ skipping 28 matching lines @@
     if (this->handleDblTap(rec.fLastX, rec.fLastY)) {
         return;
     }
 
     // count() reflects the number before we removed the owner
     switch (fTouches.count()) {
         case 1: {
             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);
             }
             fState = kEmpty_State;
         } break;
         case 2:
             this->flushLocalM();
             SkASSERT(kZoom_State == fState);
             fState = kEmpty_State;
             break;
@@ skipping 13 matching lines @@
     dx = rec0.fLastX - rec1.fLastX;
     dy = rec0.fLastY - rec1.fLastY;
     double dist1 = sqrt(dx*dx + dy*dy);
 
     double scale = dist1 / dist0;
     return (float)scale;
 }
 
 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();
             fLocalM.reset();
             fGlobalM.reset();
             fTouches.reset();
             fState = kEmpty_State;
             found = true;
         }
     }
 
-    fLastUpT = now;
+    fLastUpMillis = now;
     fLastUpP.set(x, y);
     return found;
 }