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>

9 files changed, 10 insertions, 18 deletions

diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h
index 0cd02e8034..188ce6a172 100644
--- a/include/core/SkColorPriv.h
+++ b/include/core/SkColorPriv.h
@@ -8,6 +8,7 @@
 #ifndef SkColorPriv_DEFINED
 #define SkColorPriv_DEFINED
 
+#include "../private/SkTo.h"
 #include "SkColor.h"
 #include "SkMath.h"
 
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 01e887361f..a60f26576d 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -22,7 +22,9 @@
 #include "SkMath.h"
 #include "SkRect.h"
 #include "SkSize.h"
+
 #include "../private/SkTFitsIn.h"
+#include "../private/SkTo.h"
 
 class SkReadBuffer;
 class SkWriteBuffer;
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 7b90032973..9b20689c36 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -10,6 +9,7 @@
 #ifndef SkMath_DEFINED
 #define SkMath_DEFINED
 
+#include "../private/SkTo.h"
 #include "SkTypes.h"
 
 // 64bit -> 32bit utilities
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index 4fadf984a4..84f805c637 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -19,6 +19,7 @@
 #define SkMatrix_DEFINED
 
 #include "../private/SkMacros.h"
+#include "../private/SkTo.h"
 #include "SkRect.h"
 
 struct SkRSXform;
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 4c82e50f00..3d471d15ff 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -18,6 +18,7 @@
 #ifndef SkPaint_DEFINED
 #define SkPaint_DEFINED
 
+#include "../private/SkTo.h"
 #include "SkBlendMode.h"
 #include "SkColor.h"
 #include "SkFilterQuality.h"
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 64ab531536..9906827ba8 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -20,6 +20,7 @@
 
 #include "SkMatrix.h"
 #include "../private/SkPathRef.h"
+#include "../private/SkTo.h"
 
 class SkAutoPathBoundsUpdate;
 class SkData;
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 2d9f9db120..d73c8a097e 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -8,6 +8,7 @@
 #ifndef SkStream_DEFINED
 #define SkStream_DEFINED
 
+#include "../private/SkTo.h"
 #include "SkData.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
diff --git a/include/core/SkString.h b/include/core/SkString.h
index c2fd9c0e36..aa3292abfe 100644
--- a/include/core/SkString.h
+++ b/include/core/SkString.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -11,8 +10,9 @@
 #define SkString_DEFINED
 
 #include "../private/SkTArray.h"
-#include "SkScalar.h"
+#include "../private/SkTo.h"
 #include "SkRefCnt.h"
+#include "SkScalar.h"
 
 #include <atomic>
 #include <stdarg.h>
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 2fe28fc6ce..e624d4518c 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -96,21 +96,6 @@ typedef int S16CPU;
  */
 typedef unsigned U16CPU;
 
-#include "../private/SkTFitsIn.h"
-template <typename D, typename S> constexpr D SkTo(S s) {
-    return SkASSERT(SkTFitsIn<D>(s)),
-           static_cast<D>(s);
-}
-#define SkToS8(x)    SkTo<int8_t>(x)
-#define SkToU8(x)    SkTo<uint8_t>(x)
-#define SkToS16(x)   SkTo<int16_t>(x)
-#define SkToU16(x)   SkTo<uint16_t>(x)
-#define SkToS32(x)   SkTo<int32_t>(x)
-#define SkToU32(x)   SkTo<uint32_t>(x)
-#define SkToInt(x)   SkTo<int>(x)
-#define SkToUInt(x)  SkTo<unsigned>(x)
-#define SkToSizeT(x) SkTo<size_t>(x)
-
 /** Returns 0 or 1 based on the condition
 */
 #define SkToBool(cond)  ((cond) != 0)