commit 270c04af1d470b4a528a229b4618859fd2781767
author Florin Malita <fmalita@chromium.org> Fri Aug 03 13:39:52 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 03 18:49:04 2018 +0000
tree 5162730fb0dad72e0e906c35ff035b3cd61c8dae
parent a7f5ace42a02b205353f839edc41306142892220

[skottie] Avoid redundant instantiation of image asset nodes

Add an attached asset cache, and prevent unnecessary duplication of
image nodes when referenced multiple times.

TBR=
Change-Id: I3f0e8d592b1f57d71c9bc41cec7b2240bdb6d859
Reviewed-on: https://skia-review.googlesource.com/145366
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

modules/skottie/src/Skottie.cpp

diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp
index 760d9c5..9934141 100644
--- a/modules/skottie/src/Skottie.cpp
+++ b/modules/skottie/src/Skottie.cpp
@@ -59,13 +59,19 @@
     mutable bool               fIsAttaching; // Used for cycle detection
 };
 
-using AssetMap = SkTHashMap<SkString, AssetInfo>;
+using AssetMap   = SkTHashMap<SkString, AssetInfo>;
+using AssetCache = SkTHashMap<SkString, sk_sp<sksg::RenderNode>>;
 
 struct AttachContext {
+    AttachContext makeScoped(sksg::AnimatorList& animators) const {
+        return { fResources, fAssets, fDuration, fFrameRate, fAssetCache, animators };
+    }
+
     const ResourceProvider& fResources;
     const AssetMap&         fAssets;
     const float             fDuration,
                             fFrameRate;
+    AssetCache&             fAssetCache;
     sksg::AnimatorList&     fAnimators;
 };
 
@@ -794,12 +800,8 @@
                                        time_remap;
 
     sksg::AnimatorList local_animators;
-    AttachContext local_ctx = { ctx->fResources,
-                                ctx->fAssets,
-                                ctx->fDuration,
-                                ctx->fFrameRate,
-                                requires_time_mapping ? local_animators : ctx->fAnimators };
-
+    AttachContext local_ctx = ctx->makeScoped(requires_time_mapping ? local_animators
+                                                                    : ctx->fAnimators);
     auto comp_layer = AttachAssetRef(jlayer, &local_ctx, AttachComposition);
 
     // Applies a bias/scale/remap t-adjustment to child animators.
@@ -876,6 +878,11 @@
 
     // TODO: plumb resource paths explicitly to ResourceProvider?
     const auto resName    = path.isEmpty() ? name : SkOSPath::Join(path.c_str(), name.c_str());
+
+    if (auto* attached_image = ctx->fAssetCache.find(resName)) {
+        return *attached_image;
+    }
+
     const auto resStream  = ctx->fResources.openStream(resName.c_str());
     if (!resStream || !resStream->hasLength()) {
         LOG("!! Could not load image resource: %s\n", resName.c_str());
@@ -883,8 +890,8 @@
     }
 
     // TODO: non-intrisic image sizing
-    return sksg::Image::Make(
-        SkImage::MakeFromEncoded(SkData::MakeFromStream(resStream.get(), resStream->getLength())));
+    return *ctx->fAssetCache.set(resName, sksg::Image::Make(
+        SkImage::MakeFromEncoded(SkData::MakeFromStream(resStream.get(), resStream->getLength()))));
 }
 
 sk_sp<sksg::RenderNode> AttachImageLayer(const skjson::ObjectValue& jlayer, AttachContext* ctx) {
@@ -1125,11 +1132,7 @@
     }
 
     sksg::AnimatorList layer_animators;
-    AttachContext local_ctx = { layerCtx->fCtx->fResources,
-                                layerCtx->fCtx->fAssets,
-                                layerCtx->fCtx->fDuration,
-                                layerCtx->fCtx->fFrameRate,
-                                layer_animators};
+    AttachContext local_ctx = layerCtx->fCtx->makeScoped(layer_animators);
 
     // Layer content.
     auto layer = gLayerAttachers[type](*jlayer, &local_ctx);
@@ -1350,8 +1353,9 @@
         }
     }
 
+    AssetCache asset_cache;
     sksg::AnimatorList animators;
-    AttachContext ctx = { resources, assets, this->duration(), fFrameRate, animators };
+    AttachContext ctx = { resources, assets, this->duration(), fFrameRate, asset_cache, animators };
     auto root = AttachComposition(json, &ctx);
 
     stats->fAnimatorCount = animators.size();