diff options
| author |  benjaminwagner <benjaminwagner@google.com> | 2016-03-25 12:59:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 12:59:53 -0700 |
| commit | ec4d4d784dbb250e572f8e04d18d0fd2ebeee851 (patch) | |
| tree | 444d5b0c8e1a54286d9adfc75fbc7d7e27b82fa3 /include/core/SkTypes.h | |
| parent | 9cf31f40fb5df6b6b914e087394c40b8303e5e32 (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/core/SkTypes.h')
| -rw-r--r-- | include/core/SkTypes.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index d7a791163b..a94a59233f 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -342,13 +342,15 @@ typedef uint32_t SkFourByteTag; /** 32 bit integer to hold a unicode value */ typedef int32_t SkUnichar; -/** 32 bit value to hold a millisecond count -*/ + +/** 32 bit value to hold a millisecond duration + * Note that SK_MSecMax is about 25 days. + */ typedef uint32_t SkMSec; /** 1 second measured in milliseconds */ #define SK_MSec1 1000 -/** maximum representable milliseconds +/** maximum representable milliseconds; 24d 20h 31m 23.647s. */ #define SK_MSecMax 0x7FFFFFFF /** Returns a < b for milliseconds, correctly handling wrap-around from 0xFFFFFFFF to 0 |