Revert "SkMath takes some functions from from SkTypes"
This reverts commit 3b347232bc0fd576792474562e474a7a8278200d.
Reason for revert: tree done gone red.
Original change's description:
> SkMath takes some functions from from SkTypes
>
> Moved to include/core/SkMath.h: Sk{Is|}Align{2|4|8|Ptr}, SkLeftShift,
> SkAbs{32|}, SkM{ax|in}32 SkTM{in|ax}, SkTClamp, SkFastMin32, SkTPin.
>
> Change-Id: Ibcc07be0fc3677731048e7cc86006e7aa493cb92
> Reviewed-on: https://skia-review.googlesource.com/133381
> Auto-Submit: Hal Canary <halcanary@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
TBR=mtklein@google.com,halcanary@google.com,bungeman@google.com,reed@google.com
Change-Id: I44073cf397e2a3a6a941a90f0aa63c6396d4c742
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/152587
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
diff --git a/include/core/SkFontStyle.h b/include/core/SkFontStyle.h
index 7902f7b..b619c36 100644
--- a/include/core/SkFontStyle.h
+++ b/include/core/SkFontStyle.h
@@ -8,7 +8,6 @@
#ifndef SkFontStyle_DEFINED
#define SkFontStyle_DEFINED
-#include "SkMath.h"
#include "SkTypes.h"
class SK_API SkFontStyle {
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index dd8cedb..b19436c 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -10,77 +10,6 @@
#include "SkTypes.h"
-#include <algorithm>
-
-template <typename T> static constexpr T SkAlign2(T x) { return (x + 1) >> 1 << 1; }
-template <typename T> static constexpr T SkAlign4(T x) { return (x + 3) >> 2 << 2; }
-template <typename T> static constexpr T SkAlign8(T x) { return (x + 7) >> 3 << 3; }
-
-template <typename T> static constexpr bool SkIsAlign2(T x) { return 0 == (x & 1); }
-template <typename T> static constexpr bool SkIsAlign4(T x) { return 0 == (x & 3); }
-template <typename T> static constexpr bool SkIsAlign8(T x) { return 0 == (x & 7); }
-
-template <typename T> static constexpr T SkAlignPtr(T x) {
- return sizeof(void*) == 8 ? SkAlign8(x) : SkAlign4(x);
-}
-template <typename T> static constexpr bool SkIsAlignPtr(T x) {
- return sizeof(void*) == 8 ? SkIsAlign8(x) : SkIsAlign4(x);
-}
-
-static inline int32_t SkAbs32(int32_t value) {
- SkASSERT(value != SK_NaN32); // The most negative int32_t can't be negated.
- if (value < 0) {
- value = -value;
- }
- return value;
-}
-
-static inline int32_t SkMax32(int32_t a, int32_t b) {
- if (a < b) {
- a = b;
- }
- return a;
-}
-
-static inline int32_t SkMin32(int32_t a, int32_t b) {
- if (a > b) {
- a = b;
- }
- return a;
-}
-
-static inline constexpr int32_t SkLeftShift(int32_t value, int32_t shift) {
- return (int32_t) ((uint32_t) value << shift);
-}
-
-static inline constexpr int64_t SkLeftShift(int64_t value, int32_t shift) {
- return (int64_t) ((uint64_t) value << shift);
-}
-
-template <typename T> static inline T SkTAbs(T value) {
- if (value < 0) {
- value = -value;
- }
- return value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-template <typename T> constexpr const T& SkTMin(const T& a, const T& b) { return std::min(a, b); }
-
-template <typename T> constexpr const T& SkTMax(const T& a, const T& b) { return std::max(a, b); }
-
-/** @return value pinned (clamped) between min and max, inclusively.
-*/
-template <typename T> static constexpr const T& SkTClamp(const T& x, const T& lo, const T& hi) {
- return std::max(std::min(x, hi), lo);
-}
-template <typename T> static constexpr const T& SkTPin(const T& x, const T& lo, const T& hi) {
- return SkTClamp(x, lo, hi);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
// 64bit -> 32bit utilities
// Handy util that can be passed two ints, and will automatically promote to
diff --git a/include/core/SkRect.h b/include/core/SkRect.h
index 5329412..2ba6b22 100644
--- a/include/core/SkRect.h
+++ b/include/core/SkRect.h
@@ -20,7 +20,6 @@
#include "SkPoint.h"
#include "SkSize.h"
-#include "SkMath.h"
#include "../private/SkSafe32.h"
#include "../private/SkTFitsIn.h"
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h
index 3ba2bb7..938f698 100644
--- a/include/core/SkScalar.h
+++ b/include/core/SkScalar.h
@@ -9,7 +9,6 @@
#define SkScalar_DEFINED
#include "../private/SkFloatingPoint.h"
-#include "SkMath.h"
#undef SK_SCALAR_IS_FLOAT
#define SK_SCALAR_IS_FLOAT 1
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index cb45e58..697afc8 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -99,6 +99,14 @@
static constexpr int64_t SK_MaxS64 = INT64_MAX;
static constexpr int64_t SK_MinS64 = -SK_MaxS64;
+static inline constexpr int32_t SkLeftShift(int32_t value, int32_t shift) {
+ return (int32_t) ((uint32_t) value << shift);
+}
+
+static inline constexpr int64_t SkLeftShift(int64_t value, int32_t shift) {
+ return (int64_t) ((uint64_t) value << shift);
+}
+
////////////////////////////////////////////////////////////////////////////////
/** @return the number of entries in an array (not a pointer)
@@ -106,6 +114,23 @@
template <typename T, size_t N> char (&SkArrayCountHelper(T (&array)[N]))[N];
#define SK_ARRAY_COUNT(array) (sizeof(SkArrayCountHelper(array)))
+////////////////////////////////////////////////////////////////////////////////
+
+template <typename T> static constexpr T SkAlign2(T x) { return (x + 1) >> 1 << 1; }
+template <typename T> static constexpr T SkAlign4(T x) { return (x + 3) >> 2 << 2; }
+template <typename T> static constexpr T SkAlign8(T x) { return (x + 7) >> 3 << 3; }
+
+template <typename T> static constexpr bool SkIsAlign2(T x) { return 0 == (x & 1); }
+template <typename T> static constexpr bool SkIsAlign4(T x) { return 0 == (x & 3); }
+template <typename T> static constexpr bool SkIsAlign8(T x) { return 0 == (x & 7); }
+
+template <typename T> static constexpr T SkAlignPtr(T x) {
+ return sizeof(void*) == 8 ? SkAlign8(x) : SkAlign4(x);
+}
+template <typename T> static constexpr bool SkIsAlignPtr(T x) {
+ return sizeof(void*) == 8 ? SkIsAlign8(x) : SkIsAlign4(x);
+}
+
typedef uint32_t SkFourByteTag;
static inline constexpr SkFourByteTag SkSetFourByteTag(char a, char b, char c, char d) {
return (((uint8_t)a << 24) | ((uint8_t)b << 16) | ((uint8_t)c << 8) | (uint8_t)d);
@@ -138,6 +163,51 @@
*/
static constexpr uint32_t SK_InvalidUniqueID = 0;
+static inline int32_t SkAbs32(int32_t value) {
+ SkASSERT(value != SK_NaN32); // The most negative int32_t can't be negated.
+ if (value < 0) {
+ value = -value;
+ }
+ return value;
+}
+
+template <typename T> static inline T SkTAbs(T value) {
+ if (value < 0) {
+ value = -value;
+ }
+ return value;
+}
+
+static inline int32_t SkMax32(int32_t a, int32_t b) {
+ if (a < b)
+ a = b;
+ return a;
+}
+
+static inline int32_t SkMin32(int32_t a, int32_t b) {
+ if (a > b)
+ a = b;
+ return a;
+}
+
+template <typename T> constexpr const T& SkTMin(const T& a, const T& b) {
+ return (a < b) ? a : b;
+}
+
+template <typename T> constexpr const T& SkTMax(const T& a, const T& b) {
+ return (b < a) ? a : b;
+}
+
+template <typename T> constexpr const T& SkTClamp(const T& x, const T& lo, const T& hi) {
+ return (x < lo) ? lo : SkTMin(x, hi);
+}
+
+/** @return value pinned (clamped) between min and max, inclusively.
+*/
+template <typename T> static constexpr const T& SkTPin(const T& value, const T& min, const T& max) {
+ return SkTMax(SkTMin(value, max), min);
+}
+
////////////////////////////////////////////////////////////////////////////////
/** Indicates whether an allocation should count against a cache budget.
diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 95d3881..79f6503 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -8,12 +8,11 @@
#ifndef GrContextOptions_DEFINED
#define GrContextOptions_DEFINED
-#include "../private/GrTypesPriv.h"
-#include "SkMath.h"
-#include "GrDriverBugWorkarounds.h"
-#include "GrTypes.h"
#include "SkData.h"
#include "SkTypes.h"
+#include "GrTypes.h"
+#include "../private/GrTypesPriv.h"
+#include "GrDriverBugWorkarounds.h"
#include <vector>
diff --git a/include/private/GrColor.h b/include/private/GrColor.h
index 96f2a73..b4a461d 100644
--- a/include/private/GrColor.h
+++ b/include/private/GrColor.h
@@ -6,13 +6,14 @@
* found in the LICENSE file.
*/
+
+
#ifndef GrColor_DEFINED
#define GrColor_DEFINED
#include "GrTypes.h"
#include "SkColor.h"
#include "SkColorPriv.h"
-#include "SkMath.h"
#include "SkUnPreMultiply.h"
/**
diff --git a/include/private/SkFixed.h b/include/private/SkFixed.h
index aaad075..0d15e02 100644
--- a/include/private/SkFixed.h
+++ b/include/private/SkFixed.h
@@ -8,7 +8,6 @@
#ifndef SkFixed_DEFINED
#define SkFixed_DEFINED
-#include "SkMath.h"
#include "SkSafe_math.h"
#include "SkScalar.h"
#include "SkTo.h"
diff --git a/include/private/SkFloatBits.h b/include/private/SkFloatBits.h
index a58c680..bae1542 100644
--- a/include/private/SkFloatBits.h
+++ b/include/private/SkFloatBits.h
@@ -9,10 +9,8 @@
#ifndef SkFloatBits_DEFINED
#define SkFloatBits_DEFINED
-#include "SkMath.h"
-#include "SkSafe_math.h"
#include "SkTypes.h"
-
+#include "SkSafe_math.h"
#include <float.h>
/** Convert a sign-bit int (i.e. float interpreted as int) into a 2s compliement
diff --git a/include/private/SkFloatingPoint.h b/include/private/SkFloatingPoint.h
index 9cede46..d3ebdc2 100644
--- a/include/private/SkFloatingPoint.h
+++ b/include/private/SkFloatingPoint.h
@@ -8,11 +8,9 @@
#ifndef SkFloatingPoint_DEFINED
#define SkFloatingPoint_DEFINED
-#include "SkFloatBits.h"
-#include "SkMath.h"
-#include "SkSafe_math.h"
+#include "../private/SkFloatBits.h"
#include "SkTypes.h"
-
+#include "SkSafe_math.h"
#include <float.h>
#include <math.h>
#include <cstring>
diff --git a/include/private/SkImageInfoPriv.h b/include/private/SkImageInfoPriv.h
index bb9111b..aad9e79 100644
--- a/include/private/SkImageInfoPriv.h
+++ b/include/private/SkImageInfoPriv.h
@@ -9,7 +9,6 @@
#define SkImageInfoPriv_DEFINED
#include "SkImageInfo.h"
-#include "SkMath.h"
enum SkColorTypeComponentFlag {
kRed_SkColorTypeComponentFlag = 0x1,
diff --git a/include/private/SkMutex.h b/include/private/SkMutex.h
index 56ed07f..9af23ad 100644
--- a/include/private/SkMutex.h
+++ b/include/private/SkMutex.h
@@ -8,9 +8,9 @@
#ifndef SkMutex_DEFINED
#define SkMutex_DEFINED
-#include "SkMacros.h"
-#include "SkSemaphore.h"
-#include "SkThreadID.h"
+#include "../private/SkMacros.h"
+#include "../private/SkSemaphore.h"
+#include "../private/SkThreadID.h"
#include "SkTypes.h"
#define SK_DECLARE_STATIC_MUTEX(name) static SkBaseMutex name;
diff --git a/include/private/SkSafe32.h b/include/private/SkSafe32.h
index 27e9e7a..7059d3b 100644
--- a/include/private/SkSafe32.h
+++ b/include/private/SkSafe32.h
@@ -8,7 +8,6 @@
#ifndef SkSafe32_DEFINED
#define SkSafe32_DEFINED
-#include "SkMath.h"
#include "SkTypes.h"
static constexpr int32_t Sk64_pin_to_s32(int64_t x) {
diff --git a/include/private/SkSemaphore.h b/include/private/SkSemaphore.h
index 678771d..aeca972 100644
--- a/include/private/SkSemaphore.h
+++ b/include/private/SkSemaphore.h
@@ -8,10 +8,8 @@
#ifndef SkSemaphore_DEFINED
#define SkSemaphore_DEFINED
-#include "SkMath.h"
-#include "SkOnce.h"
+#include "../private/SkOnce.h"
#include "SkTypes.h"
-
#include <atomic>
class SkBaseSemaphore {
diff --git a/include/private/SkTArray.h b/include/private/SkTArray.h
index 08289c5..75cd001 100644
--- a/include/private/SkTArray.h
+++ b/include/private/SkTArray.h
@@ -8,9 +8,9 @@
#ifndef SkTArray_DEFINED
#define SkTArray_DEFINED
-#include "SkSafe32.h"
-#include "SkTLogic.h"
-#include "SkTemplates.h"
+#include "../private/SkSafe32.h"
+#include "../private/SkTLogic.h"
+#include "../private/SkTemplates.h"
#include "SkTypes.h"
#include <new>
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h
index 2e5059c..56a2165 100644
--- a/include/private/SkTDArray.h
+++ b/include/private/SkTDArray.h
@@ -10,7 +10,6 @@
#define SkTDArray_DEFINED
#include "SkMalloc.h"
-#include "SkMath.h"
#include "SkTo.h"
#include "SkTypes.h"
diff --git a/src/android/SkBitmapRegionDecoderPriv.h b/src/android/SkBitmapRegionDecoderPriv.h
index b79b0d5..db7bd42 100644
--- a/src/android/SkBitmapRegionDecoderPriv.h
+++ b/src/android/SkBitmapRegionDecoderPriv.h
@@ -8,7 +8,6 @@
#ifndef SkBitmapRegionDecoderPriv_DEFINED
#define SkBitmapRegionDecoderPriv_DEFINED
-#include "SkMath.h"
#include "SkRect.h"
enum SubsetType {
diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h
index 2d650e5..4e6be68 100644
--- a/src/core/SkAutoMalloc.h
+++ b/src/core/SkAutoMalloc.h
@@ -11,7 +11,6 @@
#include "SkMacros.h"
#include "SkMalloc.h"
#include "SkNoncopyable.h"
-#include "SkMath.h"
#include "SkTypes.h"
#include <memory>
diff --git a/src/core/SkColorSpacePriv.h b/src/core/SkColorSpacePriv.h
index 27a3cc7..02bc9fe 100644
--- a/src/core/SkColorSpacePriv.h
+++ b/src/core/SkColorSpacePriv.h
@@ -11,7 +11,6 @@
#include "SkColorSpace.h"
#include "SkFixed.h"
-#include "SkMath.h"
#define SkColorSpacePrintf(...)
diff --git a/src/core/SkNx.h b/src/core/SkNx.h
index a644ad7..1636dde 100644
--- a/src/core/SkNx.h
+++ b/src/core/SkNx.h
@@ -8,7 +8,6 @@
#ifndef SkNx_DEFINED
#define SkNx_DEFINED
-#include "SkMath.h"
#include "SkSafe_math.h"
#include "SkScalar.h"
#include "SkTypes.h"
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index 8add84c..b34aada 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -12,7 +12,6 @@
#include "SkAtomics.h"
#include "SkMalloc.h"
-#include "SkMath.h"
#include "SkTo.h"
diff --git a/src/core/SkValidationUtils.h b/src/core/SkValidationUtils.h
index ec7c56e..84b906a 100644
--- a/src/core/SkValidationUtils.h
+++ b/src/core/SkValidationUtils.h
@@ -10,7 +10,6 @@
#include "SkBitmap.h"
#include "SkBlendMode.h"
-#include "SkMath.h"
#include "SkXfermodePriv.h"
/** Returns true if mode's value is in the SkBlendMode enum.
diff --git a/src/gpu/GrMesh.h b/src/gpu/GrMesh.h
index 111ee4b..e8a3f5c 100644
--- a/src/gpu/GrMesh.h
+++ b/src/gpu/GrMesh.h
@@ -10,7 +10,6 @@
#include "GrBuffer.h"
#include "GrPendingIOResource.h"
-#include "SkMath.h"
class GrPrimitiveProcessor;
diff --git a/src/gpu/GrRectanizer_skyline.cpp b/src/gpu/GrRectanizer_skyline.cpp
index dcd0cb6..44ef813 100644
--- a/src/gpu/GrRectanizer_skyline.cpp
+++ b/src/gpu/GrRectanizer_skyline.cpp
@@ -7,7 +7,6 @@
#include "GrRectanizer_skyline.h"
#include "SkIPoint16.h"
-#include "SkMath.h"
bool GrRectanizerSkyline::addRect(int width, int height, SkIPoint16* loc) {
if ((unsigned)width > (unsigned)this->width() ||
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index 7855feb..4da5b0f 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -15,12 +15,10 @@
#include "GrClip.h"
#include "GrContext.h"
#include "GrContextPriv.h"
-#include "GrCoordTransform.h"
-#include "GrFragmentProcessor.h"
#include "GrProxyProvider.h"
#include "GrRenderTargetContext.h"
-#include "SkMath.h"
-
+#include "GrFragmentProcessor.h"
+#include "GrCoordTransform.h"
class GrConfigConversionEffect : public GrFragmentProcessor {
public:
static bool TestForPreservingPMConversions(GrContext* context) {
diff --git a/src/gpu/mock/GrMockCaps.h b/src/gpu/mock/GrMockCaps.h
index 324ddad..1ea339b 100644
--- a/src/gpu/mock/GrMockCaps.h
+++ b/src/gpu/mock/GrMockCaps.h
@@ -9,7 +9,6 @@
#define GrMockCaps_DEFINED
#include "GrCaps.h"
-#include "SkMath.h"
#include "mock/GrMockTypes.h"
class GrMockCaps : public GrCaps {
diff --git a/src/opts/SkMorphologyImageFilter_opts.h b/src/opts/SkMorphologyImageFilter_opts.h
index 6e00a0b..0c29ff1 100644
--- a/src/opts/SkMorphologyImageFilter_opts.h
+++ b/src/opts/SkMorphologyImageFilter_opts.h
@@ -9,7 +9,6 @@
#define SkMorphologyImageFilter_opts_DEFINED
#include "SkColor.h"
-#include "SkMath.h"
namespace SK_OPTS_NS {
diff --git a/src/opts/SkNx_neon.h b/src/opts/SkNx_neon.h
index 25d2f32..98ef3fe 100644
--- a/src/opts/SkNx_neon.h
+++ b/src/opts/SkNx_neon.h
@@ -8,8 +8,6 @@
#ifndef SkNx_neon_DEFINED
#define SkNx_neon_DEFINED
-#include "SkMath.h"
-
#include <arm_neon.h>
namespace {
diff --git a/src/pathops/SkPathOpsPoint.h b/src/pathops/SkPathOpsPoint.h
index 46df2c2..f314f69 100644
--- a/src/pathops/SkPathOpsPoint.h
+++ b/src/pathops/SkPathOpsPoint.h
@@ -7,7 +7,6 @@
#ifndef SkPathOpsPoint_DEFINED
#define SkPathOpsPoint_DEFINED
-#include "SkMath.h"
#include "SkPathOpsTypes.h"
#include "SkPoint.h"
diff --git a/src/pathops/SkPathOpsRect.h b/src/pathops/SkPathOpsRect.h
index 1d52cb1..1efbb8c 100644
--- a/src/pathops/SkPathOpsRect.h
+++ b/src/pathops/SkPathOpsRect.h
@@ -7,7 +7,6 @@
#ifndef SkPathOpsRect_DEFINED
#define SkPathOpsRect_DEFINED
-#include "SkMath.h"
#include "SkPathOpsPoint.h"
struct SkDRect {
diff --git a/src/pathops/SkPathOpsTSect.h b/src/pathops/SkPathOpsTSect.h
index fa7739c..c9b51a2 100644
--- a/src/pathops/SkPathOpsTSect.h
+++ b/src/pathops/SkPathOpsTSect.h
@@ -10,7 +10,6 @@
#include "SkArenaAlloc.h"
#include "SkIntersections.h"
#include "SkMacros.h"
-#include "SkMath.h"
#include "SkPathOpsBounds.h"
#include "SkPathOpsRect.h"
#include "SkTSort.h"
diff --git a/tests/FakeStreams.h b/tests/FakeStreams.h
index 2bb5303..6b510b8 100644
--- a/tests/FakeStreams.h
+++ b/tests/FakeStreams.h
@@ -6,7 +6,6 @@
*/
#include "SkData.h"
-#include "SkMath.h"
#include "SkStream.h"
#ifndef FakeStreams_DEFINED
diff --git a/tests/PathOpsTSectDebug.h b/tests/PathOpsTSectDebug.h
index 9b5fd94..7b0f19d 100644
--- a/tests/PathOpsTSectDebug.h
+++ b/tests/PathOpsTSectDebug.h
@@ -7,7 +7,6 @@
#ifndef PathOpsTSectDebug_DEFINED
#define PathOpsTSectDebug_DEFINED
-#include "SkMath.h"
#include "SkPathOpsTSect.h"
template<typename TCurve, typename OppCurve>
diff --git a/tools/fonts/create_test_font.cpp b/tools/fonts/create_test_font.cpp
index 4892621..022d144 100644
--- a/tools/fonts/create_test_font.cpp
+++ b/tools/fonts/create_test_font.cpp
@@ -10,7 +10,6 @@
// ./tools/fonts/SkTestFontMgr.cpp
#include "SkFontStyle.h"
-#include "SkMath.h"
#include "SkOSFile.h"
#include "SkOSPath.h"
#include "SkPaint.h"
@@ -21,7 +20,6 @@
#include "SkTSort.h"
#include "SkTypeface.h"
#include "SkUTF.h"
-
#include <stdio.h>
namespace {