remove SkFloatToScalar macro

bench/ColorFilterBench.cpp

 /*
  * Copyright 2013 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 "SkCanvas.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 10 matching lines @@
 public:
     ColorFilterBaseBench(bool small) : fIsSmall(small) { }
 
 protected:
     SkRect getFilterRect() const {
         return isSmall() ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) :
                            SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
     }
 
     static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) {
-        SkScalar amount255 = SkScalarMul(SkFloatToScalar(amount), SkIntToScalar(255));
+        SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
         SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
                                 0, 1, 0, 0, amount255,
                                 0, 0, 1, 0, amount255,
                                 0, 0, 0, 1, 0 };
         SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
         return SkColorFilterImageFilter::Create(filter, input);
     }
 
     static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) {
         SkScalar matrix[20];
         memset(matrix, 0, 20 * sizeof(SkScalar));
-        matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f);
-        matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f);
-        matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f);
-        matrix[18] = SkFloatToScalar(1.0f);
+        matrix[0] = matrix[5] = matrix[10] = 0.2126f;
+        matrix[1] = matrix[6] = matrix[11] = 0.7152f;
+        matrix[2] = matrix[7] = matrix[12] = 0.0722f;
+        matrix[18] = 1.0f;
         SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
         return SkColorFilterImageFilter::Create(filter, input);
     }
 
     static SkImageFilter* make_mode_blue(SkImageFilter* input = NULL) {
         SkAutoTUnref<SkColorFilter> filter(
             SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
         return SkColorFilterImageFilter::Create(filter, input);
     }
 
@@ skipping 301 matching lines @@
 DEF_BENCH( return new ColorFilterDimBrightBench(false); )
 DEF_BENCH( return new ColorFilterBrightGrayBench(false); )
 DEF_BENCH( return new ColorFilterGrayBrightBench(false); )
 DEF_BENCH( return new ColorFilterBlueBrightBench(false); )
 DEF_BENCH( return new ColorFilterBrightBlueBench(false); )
 DEF_BENCH( return new ColorFilterBrightBench(false); )
 DEF_BENCH( return new ColorFilterBlueBench(false); )
 DEF_BENCH( return new ColorFilterGrayBench(false); )
 DEF_BENCH( return new TableColorFilterBench(false); )
 DEF_BENCH( return new LumaColorFilterBench(false); )