commit fdcfb8b7c23fbf18f872d2c31d27978235033876
author Hal Canary <halcanary@google.com> Wed Jun 13 09:42:32 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 13 13:45:47 2018 +0000
tree 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba
parent bb9ee9b4aa7d80e8a85832a462a3123060d4bd64

Revert "SkTypes: extract SkTo"

This reverts commit 2a2f67592602b18527bc3fd449132d420cd5b62e.

Reason for revert: this appears to be what is holding up the Chrome roll.

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>

TBR=mtklein@google.com,halcanary@google.com

No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iafd738aedfb679a23c061a51afe4b98a8d4cdfae
Reviewed-on: https://skia-review.googlesource.com/134504
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

modules/skottie/src/Skottie.cpp

diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp
index 229b5c6..93c71e9 100644
--- a/modules/skottie/src/Skottie.cpp
+++ b/modules/skottie/src/Skottie.cpp
@@ -8,6 +8,10 @@
 #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"
@@ -34,13 +38,8 @@
 #include "SkSGTrimEffect.h"
 #include "SkStream.h"
 #include "SkTArray.h"
-#include "SkTHash.h"
 #include "SkTime.h"
-#include "SkTo.h"
-#include "SkottieAdapter.h"
-#include "SkottieAnimator.h"
-#include "SkottieJson.h"
-#include "SkottieValue.h"
+#include "SkTHash.h"
 
 #include <cmath>
 #include <vector>