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>
diff --git a/include/private/GrColor.h b/include/private/GrColor.h
index b4a461d..96f2a73 100644
--- a/include/private/GrColor.h
+++ b/include/private/GrColor.h
@@ -6,14 +6,13 @@
* 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 0d15e02..aaad075 100644
--- a/include/private/SkFixed.h
+++ b/include/private/SkFixed.h
@@ -8,6 +8,7 @@
#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 bae1542..a58c680 100644
--- a/include/private/SkFloatBits.h
+++ b/include/private/SkFloatBits.h
@@ -9,8 +9,10 @@
#ifndef SkFloatBits_DEFINED
#define SkFloatBits_DEFINED
-#include "SkTypes.h"
+#include "SkMath.h"
#include "SkSafe_math.h"
+#include "SkTypes.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 d3ebdc2..9cede46 100644
--- a/include/private/SkFloatingPoint.h
+++ b/include/private/SkFloatingPoint.h
@@ -8,9 +8,11 @@
#ifndef SkFloatingPoint_DEFINED
#define SkFloatingPoint_DEFINED
-#include "../private/SkFloatBits.h"
-#include "SkTypes.h"
+#include "SkFloatBits.h"
+#include "SkMath.h"
#include "SkSafe_math.h"
+#include "SkTypes.h"
+
#include <float.h>
#include <math.h>
#include <cstring>
diff --git a/include/private/SkImageInfoPriv.h b/include/private/SkImageInfoPriv.h
index aad9e79..bb9111b 100644
--- a/include/private/SkImageInfoPriv.h
+++ b/include/private/SkImageInfoPriv.h
@@ -9,6 +9,7 @@
#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 9af23ad..56ed07f 100644
--- a/include/private/SkMutex.h
+++ b/include/private/SkMutex.h
@@ -8,9 +8,9 @@
#ifndef SkMutex_DEFINED
#define SkMutex_DEFINED
-#include "../private/SkMacros.h"
-#include "../private/SkSemaphore.h"
-#include "../private/SkThreadID.h"
+#include "SkMacros.h"
+#include "SkSemaphore.h"
+#include "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 7059d3b..27e9e7a 100644
--- a/include/private/SkSafe32.h
+++ b/include/private/SkSafe32.h
@@ -8,6 +8,7 @@
#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 aeca972..678771d 100644
--- a/include/private/SkSemaphore.h
+++ b/include/private/SkSemaphore.h
@@ -8,8 +8,10 @@
#ifndef SkSemaphore_DEFINED
#define SkSemaphore_DEFINED
-#include "../private/SkOnce.h"
+#include "SkMath.h"
+#include "SkOnce.h"
#include "SkTypes.h"
+
#include <atomic>
class SkBaseSemaphore {
diff --git a/include/private/SkTArray.h b/include/private/SkTArray.h
index 75cd001..08289c5 100644
--- a/include/private/SkTArray.h
+++ b/include/private/SkTArray.h
@@ -8,9 +8,9 @@
#ifndef SkTArray_DEFINED
#define SkTArray_DEFINED
-#include "../private/SkSafe32.h"
-#include "../private/SkTLogic.h"
-#include "../private/SkTemplates.h"
+#include "SkSafe32.h"
+#include "SkTLogic.h"
+#include "SkTemplates.h"
#include "SkTypes.h"
#include <new>
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h
index 56a2165..2e5059c 100644
--- a/include/private/SkTDArray.h
+++ b/include/private/SkTDArray.h
@@ -10,6 +10,7 @@
#define SkTDArray_DEFINED
#include "SkMalloc.h"
+#include "SkMath.h"
#include "SkTo.h"
#include "SkTypes.h"