From 8524c30a971cd22fe1e3e0fd3db5988fe23272b6 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Mon, 22 Jan 2018 12:31:21 -0500 Subject: Make SkAnimatedImage::update return sentinel when stopped Bug: b/63908092 Change-Id: I585f3d3efde1db4d5be36b11f19fe6e88f131608 Reviewed-on: https://skia-review.googlesource.com/98062 Reviewed-by: Leon Scroggins Commit-Queue: Leon Scroggins --- src/android/SkAnimatedImage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/android') diff --git a/src/android/SkAnimatedImage.cpp b/src/android/SkAnimatedImage.cpp index 577aa725d2..2989ade01d 100644 --- a/src/android/SkAnimatedImage.cpp +++ b/src/android/SkAnimatedImage.cpp @@ -156,12 +156,12 @@ int SkAnimatedImage::computeNextFrame(int current, bool* animationEnded) { double SkAnimatedImage::finish() { fFinished = true; fRunning = false; - return std::numeric_limits::max(); + return kNotRunning; } double SkAnimatedImage::update(double msecs) { if (fFinished) { - return std::numeric_limits::max(); + return kNotRunning; } const double lastUpdateMS = fNowMS; @@ -175,7 +175,7 @@ double SkAnimatedImage::update(double msecs) { fNowMS = lastUpdateMS; } else { if (!fRunning) { - return std::numeric_limits::max(); + return kNotRunning; } if (lastUpdateMS == kInit) { -- cgit v1.2.3