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>

7 files changed, 11 insertions, 17 deletions

diff --git a/tools/fonts/SkTestTypeface.cpp b/tools/fonts/SkTestTypeface.cpp
index 79108ce150..bf3a1a3e9e 100644
--- a/tools/fonts/SkTestTypeface.cpp
+++ b/tools/fonts/SkTestTypeface.cpp
@@ -19,9 +19,8 @@
 #include "SkRect.h"
 #include "SkScalerContext.h"
 #include "SkString.h"
-#include "SkTDArray.h"
 #include "SkTestTypeface.h"
-#include "SkTo.h"
+#include "SkTDArray.h"
 #include "SkUtils.h"
 
 #include <utility>
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 00abd957e0..14ba7a0035 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -5,6 +5,8 @@
  * found in the LICENSE file.
  */
 
+#include "GrTest.h"
+#include <algorithm>
 #include "GrBackendSurface.h"
 #include "GrContextOptions.h"
 #include "GrContextPriv.h"
@@ -18,17 +20,14 @@
 #include "GrResourceCache.h"
 #include "GrSemaphore.h"
 #include "GrSurfaceContextPriv.h"
-#include "GrTest.h"
 #include "GrTexture.h"
 #include "SkGr.h"
 #include "SkImage_Gpu.h"
 #include "SkMathPriv.h"
 #include "SkString.h"
-#include "SkTo.h"
 #include "ops/GrMeshDrawOp.h"
 #include "text/GrGlyphCache.h"
 #include "text/GrTextBlobCache.h"
-#include <algorithm>
 
 namespace GrTest {
 
diff --git a/tools/gpu/gl/debug/DebugGLTestContext.cpp b/tools/gpu/gl/debug/DebugGLTestContext.cpp
index 59f3c93fa2..2b05693366 100644
--- a/tools/gpu/gl/debug/DebugGLTestContext.cpp
+++ b/tools/gpu/gl/debug/DebugGLTestContext.cpp
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2012 Google Inc.
  *
@@ -15,10 +16,10 @@
 #include "GrTextureObj.h"
 #include "GrTextureUnitObj.h"
 #include "GrVertexArrayObj.h"
-#include "SkMutex.h"
-#include "SkTo.h"
 #include "gl/GrGLTestInterface.h"
 
+#include "SkMutex.h"
+
 namespace {
 
 // Helper macro to make creating an object (where you need to get back a derived type) easier
diff --git a/tools/sk_app/android/surface_glue_android.cpp b/tools/sk_app/android/surface_glue_android.cpp
index 04f8eeaa4c..9766d3a56d 100644
--- a/tools/sk_app/android/surface_glue_android.cpp
+++ b/tools/sk_app/android/surface_glue_android.cpp
@@ -22,7 +22,6 @@
 
 #include "../Application.h"
 #include "ResourceFactory.h"
-#include "SkTo.h"
 #include "SkTypes.h"
 #include "SkUtils.h"
 #include "Window_android.h"
diff --git a/tools/skpinfo.cpp b/tools/skpinfo.cpp
index 53ea8f326d..93834bb3a8 100644
--- a/tools/skpinfo.cpp
+++ b/tools/skpinfo.cpp
@@ -6,12 +6,11 @@
  */
 
 #include "SkCommandLineFlags.h"
-#include "SkFontDescriptor.h"
 #include "SkPicture.h"
-#include "SkPictureCommon.h"
 #include "SkPictureData.h"
+#include "SkPictureCommon.h"
 #include "SkStream.h"
-#include "SkTo.h"
+#include "SkFontDescriptor.h"
 
 DEFINE_string2(input, i, "", "skp on which to report");
 DEFINE_bool2(version, v, true, "version");
diff --git a/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp b/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
index 4eb01d4fac..b59af6a8d4 100644
--- a/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
+++ b/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
@@ -16,7 +16,6 @@
 #include "ResourceFactory.h"
 #include "SkOSPath.h"
 #include "SkStream.h"
-#include "SkTo.h"
 #include "gm_knowledge.h"
 #include "gm_runner.h"
 #include "skqp_asset_manager.h"
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 5a5489e67d..65280bc4af 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -5,6 +5,9 @@
 * found in the LICENSE file.
 */
 
+#include "Viewer.h"
+#include <stdlib.h>
+#include <map>
 #include "BisectSlide.h"
 #include "GMSlide.h"
 #include "GrContext.h"
@@ -34,15 +37,10 @@
 #include "SkTaskGroup.h"
 #include "SkTestFontMgr.h"
 #include "SkThreadedBMPDevice.h"
-#include "SkTo.h"
 #include "SvgSlide.h"
-#include "Viewer.h"
 #include "ccpr/GrCoverageCountingPathRenderer.h"
 #include "imgui.h"
 
-#include <stdlib.h>
-#include <map>
-
 #if defined(SK_HAS_SKSG)
     #include "SlideDir.h"
 #endif