commit 849f4d65713df9257f2480a1a05d235daed14b9e
author Brian Osman <brianosman@google.com> Tue Nov 26 08:58:26 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 26 14:25:44 2019 +0000
tree 4a30f2656774dca476078fd599c01b998c077113
parent 40a7dfc268b697eb3db1981ce38c1b6f18507b42

Copy SkottieUtils' classes into skresources

For now, we'll have two copies. Once clients are using the skresources
versions exclusively, we can remove the originals from skottie.

Change-Id: I3152f526b0505b8374bdd9b4513a80bddc702ccc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256416
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Kevin Lubick <kjlubick@google.com>

tools/fm/fm.cpp

diff --git a/tools/fm/fm.cpp b/tools/fm/fm.cpp
index 790876b..e56d1e7 100644
--- a/tools/fm/fm.cpp
+++ b/tools/fm/fm.cpp
@@ -34,7 +34,7 @@
 
 #if defined(SK_ENABLE_SKOTTIE)
     #include "modules/skottie/include/Skottie.h"
-    #include "modules/skottie/utils/SkottieUtils.h"
+    #include "modules/skresources/include/SkResources.h"
 #endif
 
 using sk_gpu_test::GrContextFactory;
@@ -454,7 +454,7 @@
             else if (name.endsWith(".json")) {
                 const SkString dir  = SkOSPath::Dirname(name.c_str());
                 if (sk_sp<skottie::Animation> animation = skottie::Animation::Builder()
-                        .setResourceProvider(skottie_utils::FileResourceProvider::Make(dir))
+                        .setResourceProvider(skresources::FileResourceProvider::Make(dir))
                         .make((const char*)blob->data(), blob->size())) {
                     init(source, animation);
                     continue;