fold SK_CPU_HAS_CONDITION_INSTR through as always defined

include/core/SkTypes.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTypes_DEFINED
@@ skipping 267 matching lines @@
 
 /** Generic swap function. Classes with efficient swaps should specialize this function to take
     their fast path. This function is used by SkTSort. */
 template <typename T> inline void SkTSwap(T& a, T& b) {
     T c(a);
     a = b;
     b = c;
 }
 
 static inline int32_t SkAbs32(int32_t value) {
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
-    if (value < 0)
+    if (value < 0) {
         value = -value;
+    }
     return value;
-#else
-    int32_t mask = value >> 31;
-    return (value ^ mask) - mask;
-#endif
 }
 
 template <typename T> inline T SkTAbs(T value) {
     if (value < 0) {
         value = -value;
     }
     return value;
 }
 
 static inline int32_t SkMax32(int32_t a, int32_t b) {
@@ skipping 14 matching lines @@
 
 template <typename T> const T& SkTMax(const T& a, const T& b) {
     return (b < a) ? a : b;
 }
 
 static inline int32_t SkSign32(int32_t a) {
     return (a >> 31) | ((unsigned) -a >> 31);
 }
 
 static inline int32_t SkFastMin32(int32_t value, int32_t max) {
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
-    if (value > max)
+    if (value > max) {
         value = max;
+    }
     return value;
-#else
-    int diff = max - value;
-    // clear diff if it is negative (clear if value > max)
-    diff &= (diff >> 31);
-    return value + diff;
-#endif
 }
 
 /** Returns signed 32 bit value pinned between min and max, inclusively
 */
 static inline int32_t SkPin32(int32_t value, int32_t min, int32_t max) {
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
-    if (value < min)
+    if (value < min) {
         value = min;
-    if (value > max)
+    }
+    if (value > max) {
         value = max;
-#else
-    if (value < min)
-        value = min;
-    else if (value > max)
-        value = max;
-#endif
+    }
     return value;
 }
 
 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,
@@ skipping 247 matching lines @@
 
 private:
     void*       fPtr;
     size_t      fSize;  // can be larger than the requested size (see kReuse)
     uint32_t    fStorage[(kSize + 3) >> 2];
 };
 
 #endif /* C++ */
 
 #endif