aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar benjaminwagner <benjaminwagner@google.com>2016-03-25 12:59:53 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-25 12:59:53 -0700
commitec4d4d784dbb250e572f8e04d18d0fd2ebeee851 (patch)
tree444d5b0c8e1a54286d9adfc75fbc7d7e27b82fa3 /include/views
parent9cf31f40fb5df6b6b914e087394c40b8303e5e32 (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 'include/views')
-rw-r--r--include/views/SkEvent.h9
-rw-r--r--include/views/SkTouchGesture.h4
2 files changed, 10 insertions, 3 deletions
diff --git a/include/views/SkEvent.h b/include/views/SkEvent.h
index 0af76fe686..b8fc00ef51 100644
--- a/include/views/SkEvent.h
+++ b/include/views/SkEvent.h
@@ -206,13 +206,20 @@ public:
/**
* Post to the event queue using the event's targetID or target-proc.
* The event will be delivered no sooner than the specified millisecond
- * time, as measured by SkTime::GetMSecs().
+ * time, as measured by GetMSecsSinceStartup().
*
* The event must be dynamically allocated, as ownership is transferred to
* the event queue. It cannot be allocated on the stack or in a global.
*/
void postTime(SkMSec time);
+ /**
+ * Returns ~zero the first time it's called, then returns the number of
+ * milliseconds since the first call. Behavior is undefined if the program
+ * runs more than ~25 days.
+ */
+ static SkMSec GetMSecsSinceStartup();
+
///////////////////////////////////////////////
/** Porting layer must call these functions **/
///////////////////////////////////////////////
diff --git a/include/views/SkTouchGesture.h b/include/views/SkTouchGesture.h
index 4a03065e25..60487c7a2f 100644
--- a/include/views/SkTouchGesture.h
+++ b/include/views/SkTouchGesture.h
@@ -55,14 +55,14 @@ private:
float fStartX, fStartY;
float fPrevX, fPrevY;
float fLastX, fLastY;
- SkMSec fPrevT, fLastT;
+ float fPrevT, fLastT;
};
SkTDArray<Rec> fTouches;
State fState;
SkMatrix fLocalM, fGlobalM;
SkFlingState fFlinger;
- SkMSec fLastUpT;
+ double fLastUpMillis;
SkPoint fLastUpP;