remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

include/core/SkFloatBits.h

 
 /*
  * Copyright 2008 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 SkFloatBits_DEFINED
@@ skipping 109 matching lines @@
 
 /** Return the ceiling of the float as an int.
     If the value is out of range, or NaN, return +/- SK_MaxS32
 */
 static inline int32_t SkFloatToIntCeil(float x) {
     return SkFloatBits_toIntCeil(SkFloat2Bits(x));
 }
 
 //  Scalar wrappers for float-bit routines
 
-#ifdef SK_SCALAR_IS_FLOAT
-    #define SkScalarAs2sCompliment(x)    SkFloatAs2sCompliment(x)
-    #define Sk2sComplimentAsScalar(x)    Sk2sComplimentAsFloat(x)
-#else
-    #define SkScalarAs2sCompliment(x)    (x)
-    #define Sk2sComplimentAsScalar(x)    (x)
-#endif
+#define SkScalarAs2sCompliment(x)    SkFloatAs2sCompliment(x)
+#define Sk2sComplimentAsScalar(x)    Sk2sComplimentAsFloat(x)
 
 #endif