aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar Leon Scroggins III <scroggo@google.com>2018-01-20 10:33:24 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-22 18:53:47 +0000
commit4c11945a971f18177aa494b773b24d88a942bba6 (patch)
treed413112fe36318bc3dd201fb298413bbf7c5cb27 /samplecode
parent19dd8fbabfbf38644c47af4b0feac2392e9049fc (diff)
Respect repetition count in SkAnimatedImage
Bug: b/63908092 By default use the repetition count stored in the encoded data (if any). Allow setting the repetition count manually, so that the animation will stop after n+1 total cycles (unless -1 is used for infinite). If the animation is complete, make start reset it. When the animation is not running, make update return max double (i.e. no need to update any time soon). Fix a bug where the first call to update returned -1. Share write_bm with CodecAnimTest, for debugging. Update Sample to check isRunning rather than keeping its own record of whether the animation is running. Change-Id: I883e4d7325f7a7b23a422fa9d756f9ea3018f0f8 Reviewed-on: https://skia-review.googlesource.com/97082 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleAnimatedImage.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/samplecode/SampleAnimatedImage.cpp b/samplecode/SampleAnimatedImage.cpp
index bb1dd5a3f1..5c02d29bbe 100644
--- a/samplecode/SampleAnimatedImage.cpp
+++ b/samplecode/SampleAnimatedImage.cpp
@@ -25,7 +25,6 @@ class SampleAnimatedImage : public SampleView {
public:
SampleAnimatedImage()
: INHERITED()
- , fRunning(false)
, fYOffset(0)
{}
@@ -95,12 +94,10 @@ protected:
if (fImage && SampleCode::CharQ(*evt, &uni)) {
switch (uni) {
case kPauseKey:
- if (fRunning) {
+ if (fImage->isRunning()) {
fImage->stop();
- fRunning = false;
} else {
fImage->start();
- fRunning = true;
}
return true;
case kResetKey:
@@ -116,7 +113,6 @@ protected:
private:
sk_sp<SkAnimatedImage> fImage;
sk_sp<SkDrawable> fDrawable;
- bool fRunning;
SkScalar fYOffset;
typedef SampleView INHERITED;
};