diff options
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkEvent.h | 9 | ||||
| -rw-r--r-- | include/views/SkTouchGesture.h | 4 |
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; |