remove SkFloatToScalar macro

bench/MatrixBench.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 "SkBenchmark.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
@@ skipping 56 matching lines @@
         always_do(m1 == m2);
         always_do(m2 == m0);
     }
 private:
     typedef MatrixBench INHERITED;
 };
 
 class ScaleMatrixBench : public MatrixBench {
 public:
     ScaleMatrixBench() : INHERITED("scale") {
-        fSX = fSY = SkFloatToScalar(1.5f);
+        fSX = fSY = 1.5f;
         fM0.reset();
         fM1.setScale(fSX, fSY);
         fM2.setTranslate(fSX, fSY);
     }
 protected:
     virtual void performTest() {
         SkMatrix m;
         m = fM0; m.preScale(fSX, fSY);
         m = fM1; m.preScale(fSX, fSY);
         m = fM2; m.preScale(fSX, fSY);
@@ skipping 288 matching lines @@
 };
 
 class InvertMapRectMatrixBench : public MatrixBench {
 public:
     InvertMapRectMatrixBench(const char* name, int flags)
         : INHERITED(name)
         , fFlags(flags) {
         fMatrix.reset();
         fIteration = 0;
         if (flags & kScale_Flag) {
-            fMatrix.postScale(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f));
+            fMatrix.postScale(1.5f, 2.5f);
         }
         if (flags & kTranslate_Flag) {
-            fMatrix.postTranslate(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f));
+            fMatrix.postTranslate(1.5f, 2.5f);
         }
         if (flags & kRotate_Flag) {
-            fMatrix.postRotate(SkFloatToScalar(45.0f));
+            fMatrix.postRotate(45.0f);
         }
         if (flags & kPerspective_Flag) {
-            fMatrix.setPerspX(SkFloatToScalar(1.5f));
-            fMatrix.setPerspY(SkFloatToScalar(2.5f));
+            fMatrix.setPerspX(1.5f);
+            fMatrix.setPerspY(2.5f);
         }
         if (0 == (flags & kUncachedTypeMask_Flag)) {
             fMatrix.getType();
         }
     }
     enum Flag {
         kScale_Flag             = 0x01,
         kTranslate_Flag         = 0x02,
         kRotate_Flag            = 0x04,
         kPerspective_Flag       = 0x08,
@@ skipping 62 matching lines @@
 
 DEF_BENCH( return new InvertMapRectMatrixBench(
                            "invert_maprect_typemask_nonpersp",
                            InvertMapRectMatrixBench::kUncachedTypeMask_Flag |
                            InvertMapRectMatrixBench::kScale_Flag |
                            InvertMapRectMatrixBench::kRotate_Flag |
                            InvertMapRectMatrixBench::kTranslate_Flag); )
 
 DEF_BENCH( return new ScaleTransMixedMatrixBench(); )
 DEF_BENCH( return new ScaleTransDoubleMatrixBench(); )