remove SkFloatToScalar macro

BUG=
R=reed@google.com, djsollen@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/85463005

git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81

10 files changed, 23 insertions, 23 deletions

diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index dfdae8e809..dfafe97671 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -32,8 +32,8 @@ public:
                      doPath ? "path" : "rect",
                      doAA ? "AA" : "BW");
 
-        fClipRect.set(SkFloatToScalar(10.5f), SkFloatToScalar(10.5f),
-                      SkFloatToScalar(50.5f), SkFloatToScalar(50.5f));
+        fClipRect.set(10.5f, 10.5f,
+                      50.5f, 50.5f);
         fClipPath.addRoundRect(fClipRect, SkIntToScalar(10), SkIntToScalar(10));
         fDrawRect.set(SkIntToScalar(0), SkIntToScalar(0),
                       SkIntToScalar(100), SkIntToScalar(100));
diff --git a/bench/BicubicBench.cpp b/bench/BicubicBench.cpp
index d0e48f653a..d1f4a4de72 100644
--- a/bench/BicubicBench.cpp
+++ b/bench/BicubicBench.cpp
@@ -20,7 +20,7 @@ class BicubicBench : public SkBenchmark {
 
 public:
     BicubicBench(float x, float y)
-        : fScale(SkSize::Make(SkFloatToScalar(x), SkFloatToScalar(y))) {
+        : fScale(SkSize::Make(x, y)) {
         fName.printf("bicubic_%gx%g",
                      SkScalarToFloat(fScale.fWidth), SkScalarToFloat(fScale.fHeight));
     }
diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp
index 77fbc49b11..49a6297c54 100644
--- a/bench/BlurBench.cpp
+++ b/bench/BlurBench.cpp
@@ -15,9 +15,9 @@
 #include "SkBlurMaskFilter.h"
 
 #define SMALL   SkIntToScalar(2)
-#define REAL    SkFloatToScalar(1.5f)
+#define REAL    1.5f
 #define BIG     SkIntToScalar(10)
-#define REALBIG SkFloatToScalar(100.5f)
+#define REALBIG 100.5f
 
 static const char* gStyleName[] = {
     "normal",
diff --git a/bench/BlurImageFilterBench.cpp b/bench/BlurImageFilterBench.cpp
index dc3edb03d7..1c4d4bf361 100644
--- a/bench/BlurImageFilterBench.cpp
+++ b/bench/BlurImageFilterBench.cpp
@@ -18,8 +18,8 @@
 #define FILTER_HEIGHT_SMALL 32
 #define FILTER_WIDTH_LARGE  256
 #define FILTER_HEIGHT_LARGE 256
-#define BLUR_SIGMA_SMALL    SkFloatToScalar(1.0f)
-#define BLUR_SIGMA_LARGE    SkFloatToScalar(10.0f)
+#define BLUR_SIGMA_SMALL    1.0f
+#define BLUR_SIGMA_LARGE    10.0f
 
 class BlurImageFilterBench : public SkBenchmark {
 public:
diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp
index 8161d0768c..e2528afc7f 100644
--- a/bench/BlurRectBench.cpp
+++ b/bench/BlurRectBench.cpp
@@ -14,11 +14,11 @@
 #include "SkBlurMask.h"
 
 #define SMALL   SkIntToScalar(2)
-#define REAL    SkFloatToScalar(1.5f)
+#define REAL    1.5f
 static const SkScalar kMedium = SkIntToScalar(5);
 #define BIG     SkIntToScalar(10)
 static const SkScalar kMedBig = SkIntToScalar(20);
-#define REALBIG SkFloatToScalar(30.5f)
+#define REALBIG 30.5f
 
 class BlurRectBench: public SkBenchmark {
     int         fLoopCount;
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index 6d98a0eabc..ad27f15806 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -28,7 +28,7 @@ protected:
     }
 
     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,
@@ -40,10 +40,10 @@ protected:
     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);
     }
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index c2d68b5b85..4b8cf0223e 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -74,7 +74,7 @@ private:
 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);
@@ -383,17 +383,17 @@ public:
         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();
diff --git a/bench/MatrixConvolutionBench.cpp b/bench/MatrixConvolutionBench.cpp
index 0ef32fd3be..5e3e201a20 100644
--- a/bench/MatrixConvolutionBench.cpp
+++ b/bench/MatrixConvolutionBench.cpp
@@ -21,7 +21,7 @@ public:
             SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1),
             SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
         };
-        SkScalar gain = SkFloatToScalar(0.3f), bias = SkIntToScalar(100);
+        SkScalar gain = 0.3f, bias = SkIntToScalar(100);
         SkIPoint target = SkIPoint::Make(1, 1);
         fFilter = new SkMatrixConvolutionImageFilter(kernelSize, kernel, gain, bias, target, tileMode, convolveAlpha);
     }
diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp
index c670eb2d9f..956cbbee30 100644
--- a/bench/MorphologyBench.cpp
+++ b/bench/MorphologyBench.cpp
@@ -14,7 +14,7 @@
 #include "SkMorphologyImageFilter.h"
 
 #define SMALL   SkIntToScalar(2)
-#define REAL    SkFloatToScalar(1.5f)
+#define REAL    1.5f
 #define BIG     SkIntToScalar(10)
 
 enum MorphologyType {
diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp
index 2937e5dafe..200fb0d330 100644
--- a/bench/RectBench.cpp
+++ b/bench/RectBench.cpp
@@ -186,7 +186,7 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) {
-        static const SkScalar kHalfRectSize = SkFloatToScalar(0.75f);
+        static const SkScalar kHalfRectSize = 0.75f;
 
         SkPaint paint;
         this->setupPaint(&paint);