diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-11 21:44:01 -0400 |
|---|---|---|
| committer |  Mike Klein <mtklein@google.com> | 2018-06-12 15:03:21 +0000 |
| commit | 2a2f67592602b18527bc3fd449132d420cd5b62e (patch) | |
| tree | 0f6078db2af3b904f08e8cc0118055bf1db621a5 /modules/skottie | |
| parent | 7c525e62d405d57ae7a7742cf607b9770a83a0ab (diff) | |
SkTypes: extract SkTo
Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
Reviewed-on: https://skia-review.googlesource.com/133620
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'modules/skottie')
| -rw-r--r-- | modules/skottie/src/Skottie.cpp | 11 | ||||
| -rw-r--r-- | modules/skottie/src/SkottieAdapter.cpp | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp index 93c71e936a..229b5c600a 100644 --- a/modules/skottie/src/Skottie.cpp +++ b/modules/skottie/src/Skottie.cpp @@ -8,10 +8,6 @@ #include "Skottie.h" #include "SkCanvas.h" -#include "SkottieAdapter.h" -#include "SkottieAnimator.h" -#include "SkottieJson.h" -#include "SkottieValue.h" #include "SkData.h" #include "SkImage.h" #include "SkMakeUnique.h" @@ -38,8 +34,13 @@ #include "SkSGTrimEffect.h" #include "SkStream.h" #include "SkTArray.h" -#include "SkTime.h" #include "SkTHash.h" +#include "SkTime.h" +#include "SkTo.h" +#include "SkottieAdapter.h" +#include "SkottieAnimator.h" +#include "SkottieJson.h" +#include "SkottieValue.h" #include <cmath> #include <vector> diff --git a/modules/skottie/src/SkottieAdapter.cpp b/modules/skottie/src/SkottieAdapter.cpp index a01599ccf6..2caf570eff 100644 --- a/modules/skottie/src/SkottieAdapter.cpp +++ b/modules/skottie/src/SkottieAdapter.cpp @@ -8,7 +8,6 @@ #include "SkottieAdapter.h" #include "SkMatrix.h" -#include "SkottieValue.h" #include "SkPath.h" #include "SkRRect.h" #include "SkSGGradient.h" @@ -16,6 +15,8 @@ #include "SkSGRect.h" #include "SkSGTransform.h" #include "SkSGTrimEffect.h" +#include "SkTo.h" +#include "SkottieValue.h" #include <cmath> |