commit ec4d4d784dbb250e572f8e04d18d0fd2ebeee851
author benjaminwagner <benjaminwagner@google.com> Fri Mar 25 12:59:53 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 25 12:59:53 2016 -0700
tree 444d5b0c8e1a54286d9adfc75fbc7d7e27b82fa3
parent 9cf31f40fb5df6b6b914e087394c40b8303e5e32

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

samplecode/SampleClipDrawMatch.cpp

diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp
index 502f349..45663b5 100644
--- a/samplecode/SampleClipDrawMatch.cpp
+++ b/samplecode/SampleClipDrawMatch.cpp
@@ -121,15 +121,15 @@
 
         fTrans.setRepeatCount(999);
         values[0] = values[1] = 0;
-        fTrans.setKeyFrame(0, SkTime::GetMSecs() + 1000, values);
+        fTrans.setKeyFrame(0, GetMSecs() + 1000, values);
         values[1] = 1;
-        fTrans.setKeyFrame(1, SkTime::GetMSecs() + 2000, values);
+        fTrans.setKeyFrame(1, GetMSecs() + 2000, values);
         values[0] = values[1] = 1;
-        fTrans.setKeyFrame(2, SkTime::GetMSecs() + 3000, values);
+        fTrans.setKeyFrame(2, GetMSecs() + 3000, values);
         values[1] = 0;
-        fTrans.setKeyFrame(3, SkTime::GetMSecs() + 4000, values);
+        fTrans.setKeyFrame(3, GetMSecs() + 4000, values);
         values[0] = 0;
-        fTrans.setKeyFrame(4, SkTime::GetMSecs() + 5000, values);
+        fTrans.setKeyFrame(4, GetMSecs() + 5000, values);
     }
 
 protected:
@@ -231,7 +231,7 @@
 
     void onDrawContent(SkCanvas* canvas) override {
         SkScalar trans[2];
-        fTrans.timeToValues(SkTime::GetMSecs(), trans);
+        fTrans.timeToValues(GetMSecs(), trans);
 
         SkPoint offset;
         offset.set(trans[0], trans[1]);
@@ -243,11 +243,16 @@
         this->inval(nullptr);
     }
 
+    SkMSec GetMSecs() const {
+        return static_cast<SkMSec>(SkTime::GetMSecs() - fStart);
+    }
+
 private:
     SkInterpolator  fTrans;
     Geometry        fGeom;
     bool            fClipFirst;
     int             fSign;
+    const double    fStart = SkTime::GetMSecs();
 
     typedef SampleView INHERITED;
 };