fold SK_CPU_HAS_CONDITION_INSTR through as always defined

src/core/SkMathPriv.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkMathPriv_DEFINED
 #define SkMathPriv_DEFINED
 
@@ skipping 15 matching lines @@
 static inline int32_t SkCopySign32(int32_t x, int32_t y) {
     return SkApplySign(x, SkExtractSign(x ^ y));
 }
 
 /** Given a positive value and a positive max, return the value
  pinned against max.
  Note: only works as long as max - value doesn't wrap around
  @return max if value >= max, else value
  */
 static inline unsigned SkClampUMax(unsigned value, unsigned max) {
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
     if (value > max) {
         value = max;
     }
     return value;
-#else
-    int diff = max - value;
-    // clear diff if diff is positive
-    diff &= diff >> 31;
-
-    return value + diff;
-#endif
 }
 
 /** Computes the 64bit product of a * b, and then shifts the answer down by
  shift bits, returning the low 32bits. shift must be [0..63]
  e.g. to perform a fixedmul, call SkMulShift(a, b, 16)
  */
 int32_t SkMulShift(int32_t a, int32_t b, unsigned shift);
 
 /** Return the integer cube root of value, with a bias of bitBias
  */
@@ skipping 22 matching lines @@
 }
 
 /** Just the rounding step in SkDiv255Round: round(value / 255)
  */
 static inline unsigned SkDiv255Round(unsigned prod) {
     prod += 128;
     return (prod + (prod >> 8)) >> 8;
 }
 
 #endif