move SkTPin to include/private

Change-Id: Ib0dc823d331a7cddc5da1d1be83136ce803a7871
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327783
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>

Author: Mike Klein

RELEASE_NOTES.txt

@@ -9,6 +9,8 @@ Milestone 88
 
   * <insert new release notes here>
 
+  * SkTPin() removed from public API.
+
   * Add new SkImageFilters::Blend factory function, in place of the now deprecated
     SkImageFilters::Xfermode factory function. Behavior is identical, but name better matches
     conventions in SkShader and SkColorFilter.

gm/animatedimageblurs.cpp

@@ -17,6 +17,7 @@
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
 #include "include/effects/SkImageFilters.h"
+#include "include/private/SkTPin.h"
 #include "include/utils/SkRandom.h"
 #include "tools/timer/TimeUtils.h"
 

gm/jpg_color_cube.cpp

@@ -17,6 +17,7 @@
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
+#include "include/private/SkTPin.h"
 
 #include <utility>
 

gm/p3.cpp

@@ -26,6 +26,7 @@
 #include "include/core/SkTypes.h"
 #include "include/effects/SkDashPathEffect.h"
 #include "include/effects/SkGradientShader.h"
+#include "include/private/SkTPin.h"
 #include "src/core/SkColorSpaceXformSteps.h"
 
 #include <math.h>

gm/wacky_yuv_formats.cpp

@@ -42,6 +42,7 @@
 #include "include/private/GrTypesPriv.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTDArray.h"
+#include "include/private/SkTPin.h"
 #include "include/private/SkTemplates.h"
 #include "include/utils/SkTextUtils.h"
 #include "src/core/SkConvertPixels.h"

include/core/SkColorPriv.h

@@ -10,6 +10,7 @@
 
 #include "include/core/SkColor.h"
 #include "include/core/SkMath.h"
+#include "include/private/SkTPin.h"
 #include "include/private/SkTo.h"
 
 /** Turn 0..255 into 0..256 by adding 1 at the half-way point. Used to turn a

include/core/SkFontStyle.h

@@ -9,6 +9,7 @@
 #define SkFontStyle_DEFINED
 
 #include "include/core/SkTypes.h"
+#include "include/private/SkTPin.h"
 
 class SK_API SkFontStyle {
 public:

include/core/SkTypes.h

@@ -581,23 +581,6 @@ template <typename T> static inline T SkTAbs(T value) {
     return value;
 }
 
-/** @return x pinned (clamped) between lo and hi, inclusively.
-
-    Unlike std::clamp(), SkTPin() always returns a value between lo and hi.
-    If x is NaN, SkTPin() returns hi but std::clamp() returns NaN.
-*/
-template <typename T>
-static constexpr const T& SkTPin(const T& x, const T& lo, const T& hi) {
-#if 0
-    return std::max(std::min(hi, x), lo);
-#else
-    // To avoid the need to #include <algorithm>, we use this equivalent logic:
-    return x < lo ? lo
-        :  x < hi ? x
-        : /*else*/  hi;
-#endif
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 /** Indicates whether an allocation should count against a cache budget.

include/private/SkFixed.h

@@ -11,6 +11,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkSafe_math.h"
+#include "include/private/SkTPin.h"
 #include "include/private/SkTo.h"
 
 /** \file SkFixed.h

include/private/SkTPin.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTPin_DEFINED
+#define SkTPin_DEFINED
+
+/** @return x pinned (clamped) between lo and hi, inclusively.
+
+    Unlike std::clamp(), SkTPin() always returns a value between lo and hi.
+    If x is NaN, SkTPin() returns hi but std::clamp() returns NaN.
+*/
+template <typename T>
+static constexpr const T& SkTPin(const T& x, const T& lo, const T& hi) {
+    // TODO: return std::max(std::min(hi, x), lo)
+    // TODO: return std::max(lo, std::min(x, hi)) ?   (clamps NaN to lo)
+    return x < lo ? lo
+        :  x < hi ? x
+        : /*else*/  hi;
+}
+
+#endif