diff options
author | Florin Malita <fmalita@chromium.org> | 2018-05-26 09:49:28 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-27 02:21:33 +0000 |
commit | 3d856bdeee7fae2ff36cdb6a9807c588fc030eb1 (patch) | |
tree | b26aa52b2d2f8877bdc7a7c647e4a34fd3e96f35 /tools/viewer | |
parent | d8eb7b6b12d5b155214031d4aa4d8f582ebb91a1 (diff) |
[skottie] Relocate to modules/skottie
TBR=
Change-Id: I218d251ca56578a3a7fd4fb86cba9abdc10fb3bd
Reviewed-on: https://skia-review.googlesource.com/130322
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tools/viewer')
-rw-r--r-- | tools/viewer/SkottieSlide.cpp | 4 | ||||
-rw-r--r-- | tools/viewer/SkottieSlide.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/viewer/SkottieSlide.cpp b/tools/viewer/SkottieSlide.cpp index 78cda5cbda..f009066182 100644 --- a/tools/viewer/SkottieSlide.cpp +++ b/tools/viewer/SkottieSlide.cpp @@ -7,6 +7,8 @@ #include "SkottieSlide.h" +#if defined(SK_ENABLE_SKOTTIE) + #include "SkAnimTimer.h" #include "SkCanvas.h" #include "Skottie.h" @@ -130,3 +132,5 @@ bool SkottieSlide::onMouse(SkScalar x, SkScalar y, sk_app::Window::InputState st return false; } + +#endif // SK_ENABLE_SKOTTIE diff --git a/tools/viewer/SkottieSlide.h b/tools/viewer/SkottieSlide.h index 0bfe66eef4..9ed4d78c8b 100644 --- a/tools/viewer/SkottieSlide.h +++ b/tools/viewer/SkottieSlide.h @@ -9,6 +9,8 @@ #define SkottieSlide_DEFINED #include "Slide.h" + +#if defined(SK_ENABLE_SKOTTIE) #include "Skottie.h" namespace sksg { class Scene; } @@ -41,4 +43,6 @@ private: typedef Slide INHERITED; }; +#endif // SK_ENABLE_SKOTTIE + #endif // SkottieSlide_DEFINED |