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>

15 files changed, 21 insertions, 7 deletions

diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp
index e67d8f1e79..85f0ad59a6 100644
--- a/tests/Float16Test.cpp
+++ b/tests/Float16Test.cpp
@@ -5,14 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkAutoPixmapStorage.h"
 #include "SkColor.h"
 #include "SkHalf.h"
 #include "SkOpts.h"
-#include "SkPixmap.h"
 #include "SkPM4f.h"
+#include "SkPixmap.h"
 #include "SkRandom.h"
+#include "SkTo.h"
+#include "Test.h"
 
 #include <cmath>
 
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index b5d933d987..857440c9f9 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -13,6 +13,7 @@
 #include "SkMathPriv.h"
 #include "SkPoint.h"
 #include "SkRandom.h"
+#include "SkTo.h"
 #include "Test.h"
 
 static void test_clz(skiatest::Reporter* reporter) {
diff --git a/tests/PDFDeflateWStreamTest.cpp b/tests/PDFDeflateWStreamTest.cpp
index 3d734c81a1..d32828c29e 100644
--- a/tests/PDFDeflateWStreamTest.cpp
+++ b/tests/PDFDeflateWStreamTest.cpp
@@ -11,6 +11,7 @@
 
 #include "SkDeflate.h"
 #include "SkRandom.h"
+#include "SkTo.h"
 
 namespace {
 
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index b90e11126d..ab520eba78 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -13,6 +13,7 @@
 #include "SkData.h"
 #include "SkPDFMakeToUnicodeCmap.h"
 #include "SkStream.h"
+#include "SkTo.h"
 
 static const int kMaximumGlyphCount = UINT16_MAX + 1;
 
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index d25adea16f..f23c8e34df 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -14,8 +14,8 @@
 #include "SkCanvas.h"
 #include "SkClusterator.h"
 #include "SkData.h"
-#include "SkDocument.h"
 #include "SkDeflate.h"
+#include "SkDocument.h"
 #include "SkImageEncoder.h"
 #include "SkImageFilterPriv.h"
 #include "SkMakeUnique.h"
@@ -29,6 +29,7 @@
 #include "SkScalar.h"
 #include "SkSpecialImage.h"
 #include "SkStream.h"
+#include "SkTo.h"
 #include "SkTypes.h"
 #include "sk_tool_utils.h"
 
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index e52308c159..2794058ceb 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -13,6 +13,7 @@
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkReadBuffer.h"
+#include "SkTo.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"
 #include "SkWriteBuffer.h"
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 565e8d817b..30d27c1e1b 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -21,10 +21,11 @@
 #include "SkStream.h"
 #include "SkStrokeRec.h"
 #include "SkSurface.h"
+#include "SkTo.h"
 #include "SkWriter32.h"
 #include "Test.h"
-#include <cmath>
 
+#include <cmath>
 
 static void set_radii(SkVector radii[4], int index, float rad) {
     sk_bzero(radii, sizeof(SkVector) * 4);
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 0dc1fc090c..d7f4d54ae1 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -18,6 +18,7 @@
 #include "ProxyUtils.h"
 #include "SkCanvas.h"
 #include "SkSurface.h"
+#include "SkTo.h"
 
 // This was made indivisible by 4 to ensure we test setting GL_PACK_ALIGNMENT properly.
 static const int X_SIZE = 13;
diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp
index 6cf533fa1b..4d1d414bf9 100644
--- a/tests/SVGDeviceTest.cpp
+++ b/tests/SVGDeviceTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ -14,6 +13,7 @@
 #include "SkParse.h"
 #include "SkShader.h"
 #include "SkStream.h"
+#include "SkTo.h"
 #include "Test.h"
 
 #include <string.h>
diff --git a/tests/SkBase64Test.cpp b/tests/SkBase64Test.cpp
index d855ef57ad..30bfbce28b 100644
--- a/tests/SkBase64Test.cpp
+++ b/tests/SkBase64Test.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkBase64.h"
+#include "SkTo.h"
 
 #include "Test.h"
 
diff --git a/tests/SkPEGTest.cpp b/tests/SkPEGTest.cpp
index 6773c1b8ca..2b51dfd5c5 100644
--- a/tests/SkPEGTest.cpp
+++ b/tests/SkPEGTest.cpp
@@ -9,6 +9,7 @@
 
 #if defined(SK_XML)
 #include "SkPEG.h"
+#include "SkTo.h"
 
 using namespace skpeg;
 
diff --git a/tests/SkRasterPipelineTest.cpp b/tests/SkRasterPipelineTest.cpp
index e54c8c8039..4c7658719b 100644
--- a/tests/SkRasterPipelineTest.cpp
+++ b/tests/SkRasterPipelineTest.cpp
@@ -5,10 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
+#include "../src/jumper/SkJumper.h"
 #include "SkHalf.h"
 #include "SkRasterPipeline.h"
-#include "../src/jumper/SkJumper.h"
+#include "SkTo.h"
+#include "Test.h"
 
 DEF_TEST(SkRasterPipeline, r) {
     // Build and run a simple pipeline to exercise SkRasterPipeline,
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 7cf8d92bc5..3372ee878a 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -14,6 +14,7 @@
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
+#include "SkTo.h"
 #include "Test.h"
 
 #include <functional>
diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp
index 6aabc45a2a..c94955838c 100644
--- a/tests/TextBlobTest.cpp
+++ b/tests/TextBlobTest.cpp
@@ -8,6 +8,7 @@
 #include "SkPaint.h"
 #include "SkPoint.h"
 #include "SkTextBlobRunIterator.h"
+#include "SkTo.h"
 #include "SkTypeface.h"
 
 #include "Test.h"
diff --git a/tests/Time.cpp b/tests/Time.cpp
index f6bf9ff3f5..5a07f08925 100644
--- a/tests/Time.cpp
+++ b/tests/Time.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkTime.h"
+#include "SkTo.h"
 #include "Test.h"
 
 // Sanity checks for the GetDateTime function.