From c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c Mon Sep 17 00:00:00 2001
From: Hal Canary <halcanary@google.com>
Date: Wed, 13 Jun 2018 09:59:02 -0400
Subject: Revert "Revert "SkTypes: extract SkTo""

This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876.

> Original change's description:
> > SkTypes: extract SkTo
> >
> > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
> > Reviewed-on: https://skia-review.googlesource.com/133620
> > Reviewed-by: Mike Klein <mtklein@google.com>

Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa
Reviewed-on: https://skia-review.googlesource.com/134506
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
---
 modules/skottie/src/Skottie.cpp        | 11 ++++++-----
 modules/skottie/src/SkottieAdapter.cpp |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'modules/skottie')

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>
 
-- 
cgit v1.2.3