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

include/core/SkTime.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTime_DEFINED
@@ skipping 16 matching lines @@
         uint8_t  fDayOfWeek;     //!< 0..6, 0==Sunday
         uint8_t  fDay;           //!< 1..31
         uint8_t  fHour;          //!< 0..23
         uint8_t  fMinute;        //!< 0..59
         uint8_t  fSecond;        //!< 0..59
 
         void toISO8601(SkString* dst) const;
     };
     static void GetDateTime(DateTime*);
 
-    static SkMSec GetMSecs() { return (SkMSec)(GetNSecs() * 1e-6); }
+    static double GetSecs() { return GetNSecs() * 1e-9; }
+    static double GetMSecs() { return GetNSecs() * 1e-6; }
     static double GetNSecs();
 };
 
-#define SK_TIME_FACTOR      1
-
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkAutoTime {
 public:
     // The label is not deep-copied, so its address must remain valid for the
     // lifetime of this object
-    SkAutoTime(const char* label = NULL, SkMSec minToDump = 0) : fLabel(label)
-    {
-        fNow = SkTime::GetMSecs();
-        fMinToDump = minToDump;
-    }
-    ~SkAutoTime()
-    {
-        SkMSec dur = SkTime::GetMSecs() - fNow;
-        if (dur >= fMinToDump) {
-            SkDebugf("%s %d\n", fLabel ? fLabel : "", dur);
-        }
+    SkAutoTime(const char* label = nullptr)
+        : fLabel(label)
+        , fNow(SkTime::GetMSecs()) {}
+    ~SkAutoTime() {
+        uint64_t dur = static_cast<uint64_t>(SkTime::GetMSecs() - fNow);
+        SkDebugf("%s %ld\n", fLabel ? fLabel : "", dur);
     }
 private:
     const char* fLabel;
-    SkMSec      fNow;
-    SkMSec      fMinToDump;
+    double      fNow;
 };
 #define SkAutoTime(...) SK_REQUIRE_LOCAL_VAR(SkAutoTime)
 
 #endif