commit 62c6bd910abbb64e4fd94caf16c14c7519878a3a
author Florin Malita <fmalita@chromium.org> Wed Oct 03 14:39:56 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 03 19:02:35 2018 +0000
tree 222364ff6d12207d2e7f8d1d53404c4914a7446d
parent b4d895606f77c23bd34a1b57419723f6431e3386

[skottie] Multi-frame image support

Extend the image asset provider API to support animated/multi-frame images.

Add a GM based on SkAnimCodecPlayer + animated public domain GIF
(source: https://giphy.com/explore/public-domain).

Bug: skia:
Change-Id: Iaa596e01a7626ca6574db1ebc90632f5a9a02bdc
Reviewed-on: https://skia-review.googlesource.com/159162
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>

modules/sksg/include/SkSGImage.h

diff --git a/modules/sksg/include/SkSGImage.h b/modules/sksg/include/SkSGImage.h
index dd524c3..b6aef47 100644
--- a/modules/sksg/include/SkSGImage.h
+++ b/modules/sksg/include/SkSGImage.h
@@ -23,9 +23,10 @@
 class Image final : public RenderNode {
 public:
     static sk_sp<Image> Make(sk_sp<SkImage> image) {
-        return image ? sk_sp<Image>(new Image(std::move(image))) : nullptr;
+        return sk_sp<Image>(new Image(std::move(image)));
     }
 
+    SG_ATTRIBUTE(Image,     sk_sp<SkImage> , fImage    )
     SG_ATTRIBUTE(Quality  , SkFilterQuality, fQuality  )
     SG_ATTRIBUTE(AntiAlias, bool           , fAntiAlias)
 
@@ -37,9 +38,9 @@
     SkRect onRevalidate(InvalidationController*, const SkMatrix&) override;
 
 private:
-    const sk_sp<SkImage> fImage;
-    SkFilterQuality      fQuality   = kLow_SkFilterQuality;
-    bool                 fAntiAlias = true;
+    sk_sp<SkImage>  fImage;
+    SkFilterQuality fQuality   = kLow_SkFilterQuality;
+    bool            fAntiAlias = true;
 
     typedef RenderNode INHERITED;
 };