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>

8 files changed, 3 insertions, 15 deletions

diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index c2724bdedb..a718cdeac6 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -5,12 +5,11 @@
 * found in the LICENSE file.
 */
 
+#include "gm.h"
 #include "SkBlurMask.h"
 #include "SkCanvas.h"
 #include "SkMaskFilter.h"
 #include "SkPath.h"
-#include "SkTo.h"
-#include "gm.h"
 
 #define STROKE_WIDTH    SkIntToScalar(10)
 
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index ae57aa8eb2..ab8d1e6840 100644
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -4,15 +4,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
+#include "gm.h"
+#include "sk_tool_utils.h"
 #include "Resources.h"
 #include "SkCanvas.h"
 #include "SkStream.h"
 #include "SkSurface.h"
-#include "SkTo.h"
 #include "SkTypeface.h"
-#include "gm.h"
-#include "sk_tool_utils.h"
 
 class DFTextGM : public skiagm::GM {
 public:
diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index 1fcce5fca5..eac570ac58 100644
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -7,13 +7,11 @@
 
 #include "gm.h"
 #include "sk_tool_utils.h"
-
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkTemplates.h"
-#include "SkTo.h"
 
 static void strokePath(SkCanvas* canvas, const SkPath& path) {
         SkPaint paint;
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp
index 4139ca802b..8a26a0066e 100644
--- a/gm/imagefromyuvtextures.cpp
+++ b/gm/imagefromyuvtextures.cpp
@@ -16,7 +16,6 @@
 #include "SkBitmap.h"
 #include "SkGradientShader.h"
 #include "SkImage.h"
-#include "SkTo.h"
 
 namespace skiagm {
 class ImageFromYUVTextures : public GM {
diff --git a/gm/pdf_never_embed.cpp b/gm/pdf_never_embed.cpp
index adaf78b450..e090c5a5b8 100644
--- a/gm/pdf_never_embed.cpp
+++ b/gm/pdf_never_embed.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Resources.h"
-#include "SkTo.h"
 #include "SkTypeface.h"
 #include "gm.h"
 
diff --git a/gm/scaledemoji.cpp b/gm/scaledemoji.cpp
index b71c470902..ac8b3c6d51 100644
--- a/gm/scaledemoji.cpp
+++ b/gm/scaledemoji.cpp
@@ -11,7 +11,6 @@
 #include "Resources.h"
 #include "SkCanvas.h"
 #include "SkStream.h"
-#include "SkTo.h"
 #include "SkTypeface.h"
 
 namespace skiagm {
diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp
index a16f54ac96..b70ae3dc35 100644
--- a/gm/tallstretchedbitmaps.cpp
+++ b/gm/tallstretchedbitmaps.cpp
@@ -6,12 +6,10 @@
  */
 
 #include "gm.h"
-
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkRandom.h"
-#include "SkTo.h"
 
 int make_bm(SkBitmap* bm, int height) {
     constexpr int kRadius = 22;
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp
index 74675d7289..de149ae9d4 100644
--- a/gm/texteffects.cpp
+++ b/gm/texteffects.cpp
@@ -7,12 +7,10 @@
 
 #include "gm.h"
 #include "sk_tool_utils.h"
-
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkReadBuffer.h"
 #include "SkTextBlob.h"
-#include "SkTo.h"
 #include "SkWriteBuffer.h"
 
 #include "Sk2DPathEffect.h"