remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

src/animator/SkScriptTokenizer.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkScript2.h"
 #include "SkData.h"
 #include "SkFloatingPoint.h"
@@ skipping 1256 matching lines @@
             SkASSERT(0);
             return false;
     }
     return true; // no error
 }
 
 #ifdef SK_DEBUG
 #if defined(SK_SUPPORT_UNITTEST)
 
 #define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL }
-#ifdef SK_SCALAR_IS_FLOAT
 #define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (float) (expression), NULL }
 #define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, fmodf((float) exp1, (float) exp2), NULL }
-#else
-#define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (int) ((expression) * 65536.0f), NULL }
-#define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, (int) (fmod(exp1, exp2)  * 65536.0f), NULL }
-#endif
 #define testTrue(expression) { #expression, SkOperand2::kS32, 1, 0, NULL }
 #define testFalse(expression) { #expression, SkOperand2::kS32, 0, 0, NULL }
 
 static const SkScriptNAnswer2 scriptTests[]  = {
     testInt(1||(0&&3)),
     testScalar(- -5.5- -1.5),
     testScalar(1.0+5),
     testInt((6+7)*8),
     testInt(3*(4+5)),
     testScalar(1.0+2.0),
@@ skipping 208 matching lines @@
             case SkOperand2::kString:
                 SkASSERT(value.fOperand.fString->equals(scriptTests[index].fStringAnswer));
                 break;
             default:
                 SkASSERT(0);
         }
     }
 #endif  // SK_SUPPORT_UNITTEST
 }
 #endif  // SK_DEBUG