remove cruft from SkTypes.h, including SkBool
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1548223002
TBR=
Review URL: https://codereview.chromium.org/1548223002
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 261fcae..c112b03 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -248,12 +248,6 @@
typedef unsigned U16CPU;
/**
- * Meant to be faster than bool (doesn't promise to be 0 or 1,
- * just 0 or non-zero
- */
-typedef int SkBool;
-
-/**
* Meant to be a small version of bool, for storage purposes. Will be 0 or 1
*/
typedef uint8_t SkBool8;
@@ -441,17 +435,6 @@
return SkTMax(SkTMin(value, max), min);
}
-static inline uint32_t SkSetClearShift(uint32_t bits, bool cond,
- unsigned shift) {
- SkASSERT((int)cond == 0 || (int)cond == 1);
- return (bits & ~(1 << shift)) | ((int)cond << shift);
-}
-
-static inline uint32_t SkSetClearMask(uint32_t bits, bool cond,
- uint32_t mask) {
- return cond ? bits | mask : bits & ~mask;
-}
-
///////////////////////////////////////////////////////////////////////////////
/** Use to combine multiple bits in a bitmask in a type safe way.
diff --git a/include/utils/SkInterpolator.h b/include/utils/SkInterpolator.h
index 18203d0..9547cec 100644
--- a/include/utils/SkInterpolator.h
+++ b/include/utils/SkInterpolator.h
@@ -59,7 +59,7 @@
fFlags = SkToU8((fFlags & ~kReset) | (int)reset);
}
- Result timeToT(SkMSec time, SkScalar* T, int* index, SkBool* exact) const;
+ Result timeToT(SkMSec time, SkScalar* T, int* index, bool* exact) const;
protected:
enum Flags {