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

17 files changed, 128 insertions, 128 deletions

diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index f70cfd679f..6c681913eb 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -386,10 +386,10 @@ static void test_regressions() {
     {
         SkAAClip clip;
         SkRect r;
-        r.fLeft = SkFloatToScalar(129.892181f);
-        r.fTop = SkFloatToScalar(10.3999996f);
-        r.fRight = SkFloatToScalar(130.892181f);
-        r.fBottom = SkFloatToScalar(20.3999996f);
+        r.fLeft = 129.892181f;
+        r.fTop = 10.3999996f;
+        r.fRight = 130.892181f;
+        r.fBottom = 20.3999996f;
         clip.setRect(r, true);
     }
 }
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index 9c40aa791c..a1eaca92b4 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -349,7 +349,7 @@ static void test_sigma_range(skiatest::Reporter* reporter, GrContextFactory* fac
     int groundTruthResult[kSize];
     int bruteForce1DResult[kSize];
 
-    SkScalar sigma = SkFloatToScalar(10.0f);
+    SkScalar sigma = 10.0f;
 
     for (int i = 0; i < 4; ++i, sigma /= 10) {
 
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index d19c22dc9c..82eeee3ef5 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -44,8 +44,8 @@ static bool CurvesAreEqual(const SkPoint c0[4],
                            const SkPoint c1[4],
                            float tol) {
     for (int i = 0; i < 4; i++) {
-        if (SkScalarAbs(c0[i].fX - c1[i].fX) > SkFloatToScalar(tol) ||
-            SkScalarAbs(c0[i].fY - c1[i].fY) > SkFloatToScalar(tol)
+        if (SkScalarAbs(c0[i].fX - c1[i].fX) > tol ||
+            SkScalarAbs(c0[i].fY - c1[i].fY) > tol
         ) {
             PrintCurve("c0", c0);
             PrintCurve("c1", c1);
@@ -61,10 +61,10 @@ static SkPoint* SetCurve(float x0, float y0,
                          float x2, float y2,
                          float x3, float y3,
                          SkPoint crv[4]) {
-    crv[0].fX = SkFloatToScalar(x0);   crv[0].fY = SkFloatToScalar(y0);
-    crv[1].fX = SkFloatToScalar(x1);   crv[1].fY = SkFloatToScalar(y1);
-    crv[2].fX = SkFloatToScalar(x2);   crv[2].fY = SkFloatToScalar(y2);
-    crv[3].fX = SkFloatToScalar(x3);   crv[3].fY = SkFloatToScalar(y3);
+    crv[0].fX = x0;   crv[0].fY = y0;
+    crv[1].fX = x1;   crv[1].fY = y1;
+    crv[2].fX = x2;   crv[2].fY = y2;
+    crv[3].fX = x3;   crv[3].fY = y3;
     return crv;
 }
 
@@ -81,7 +81,7 @@ static void TestCubicClipping(skiatest::Reporter* reporter) {
     SkPoint clipped[4], shouldbe[4];
     SkIRect clipRect;
     bool success;
-    const float tol = SkFloatToScalar(1e-4f);
+    const float tol = 1e-4f;
 
     // Test no clip, with plenty of room.
     clipRect.set(-2, -2, 6, 14);
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index b4eee60c01..a81e6559f9 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -22,8 +22,8 @@ static void test_hairclipping(skiatest::Reporter* reporter) {
 
     SkCanvas canvas(bm);
     canvas.clipRect(SkRect::MakeWH(SkIntToScalar(4), SkIntToScalar(2)));
-    canvas.drawLine(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f),
-                    SkFloatToScalar(3.5f), SkFloatToScalar(3.5f), paint);
+    canvas.drawLine(1.5f, 1.5f,
+                    3.5f, 3.5f, paint);
 
     /**
      *  We had a bug where we misinterpreted the bottom of the clip, and
@@ -52,10 +52,10 @@ static void test_edgeclipper() {
     SkEdgeClipper clipper;
 
     const SkPoint pts[] = {
-        { SkFloatToScalar(3.0995476e+010f),  SkFloatToScalar(42.929779f) },
-        { SkFloatToScalar(-3.0995163e+010f), SkFloatToScalar(51.050385f) },
-        { SkFloatToScalar(-3.0995157e+010f), SkFloatToScalar(51.050392f) },
-        { SkFloatToScalar(-3.0995134e+010f), SkFloatToScalar(51.050400f) },
+        { 3.0995476e+010f,  42.929779f },
+        { -3.0995163e+010f, 51.050385f },
+        { -3.0995157e+010f, 51.050392f },
+        { -3.0995134e+010f, 51.050400f },
     };
 
     const SkRect clip = { 0, 0, SkIntToScalar(300), SkIntToScalar(200) };
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index ab667fdfae..4c6d634eb0 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -120,13 +120,13 @@ static void test_treatAsSprite(skiatest::Reporter* reporter) {
 
     size.set(500, 600);
 
-    const SkScalar tooMuchSubpixel = SkFloatToScalar(100.1f);
+    const SkScalar tooMuchSubpixel = 100.1f;
     mat.setTranslate(tooMuchSubpixel, 0);
     REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits));
     mat.setTranslate(0, tooMuchSubpixel);
     REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits));
 
-    const SkScalar tinySubPixel = SkFloatToScalar(100.02f);
+    const SkScalar tinySubPixel = 100.02f;
     mat.setTranslate(tinySubPixel, 0);
     REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits));
     mat.setTranslate(0, tinySubPixel);
@@ -181,12 +181,12 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter,
     SkMatrix matrix;
 
     SkCanvas c(dev);
-    matrix.setAll(SkFloatToScalar(-119.34097f),
-                  SkFloatToScalar(-43.436558f),
-                  SkFloatToScalar(93489.945f),
-                  SkFloatToScalar(43.436558f),
-                  SkFloatToScalar(-119.34097f),
-                  SkFloatToScalar(123.98426f),
+    matrix.setAll(-119.34097f,
+                  -43.436558f,
+                  93489.945f,
+                  43.436558f,
+                  -119.34097f,
+                  123.98426f,
                   0, 0, SK_Scalar1);
     c.concat(matrix);
 
@@ -197,11 +197,11 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter,
 
     SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
                                                SkShader::kRepeat_TileMode);
-    matrix.setAll(SkFloatToScalar(0.0078740157f),
+    matrix.setAll(0.0078740157f,
                   0,
                   SkIntToScalar(249),
                   0,
-                  SkFloatToScalar(0.0078740157f),
+                  0.0078740157f,
                   SkIntToScalar(239),
                   0, 0, SK_Scalar1);
     s->setLocalMatrix(matrix);
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index 4f3eb829a1..b1bb19de65 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -80,8 +80,8 @@ static void test_drawText(skiatest::Reporter* reporter) {
 
     for (float offsetY = 0.0f; offsetY < 1.0f; offsetY += (1.0f / 16.0f)) {
         for (float offsetX = 0.0f; offsetX < 1.0f; offsetX += (1.0f / 16.0f)) {
-            SkPoint point = SkPoint::Make(SkFloatToScalar(25.0f + offsetX),
-                                          SkFloatToScalar(25.0f + offsetY));
+            SkPoint point = SkPoint::Make(25.0f + offsetX,
+                                          25.0f + offsetY);
 
             for (int align = 0; align < SkPaint::kAlignCount; ++align) {
                 paint.setTextAlign(static_cast<SkPaint::Align>(align));
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 2328627d7c..69afe47c27 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -58,7 +58,7 @@ public:
     }
 
     static SkImageFilter* make_scale(float amount, SkImageFilter* input = NULL) {
-        SkScalar s = SkFloatToScalar(amount);
+        SkScalar s = amount;
         SkScalar matrix[20] = { s, 0, 0, 0, 0,
                                 0, s, 0, 0, 0,
                                 0, 0, s, 0, 0,
@@ -70,10 +70,10 @@ public:
     static SkImageFilter* make_grayscale(SkImageFilter* input = NULL, const SkImageFilter::CropRect* cropRect = 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, cropRect);
     }
@@ -128,12 +128,12 @@ public:
                 // 2 ) location and target at same value
                 SkPoint3 target(location.fX, location.fY, location.fZ);
                 // 3 ) large negative specular exponent value
-                SkScalar specularExponent = SkFloatToScalar(-1000);
+                SkScalar specularExponent = -1000;
 
                 SkAutoTUnref<SkImageFilter> bmSrc(new SkBitmapSource(bitmap));
                 SkPaint paint;
                 paint.setImageFilter(SkLightingImageFilter::CreateSpotLitSpecular(
-                        location, target, specularExponent, SkFloatToScalar(180),
+                        location, target, specularExponent, 180,
                         0xFFFFFFFF, SK_Scalar1, SK_Scalar1, SK_Scalar1,
                         bmSrc))->unref();
                 SkCanvas canvas(result);
@@ -144,7 +144,7 @@ public:
 
             {
                 // This tests for scale bringing width to 0
-                SkSize scale = SkSize::Make(SkFloatToScalar(-0.001f), SK_Scalar1);
+                SkSize scale = SkSize::Make(-0.001f, SK_Scalar1);
                 SkAutoTUnref<SkImageFilter> bmSrc(new SkBitmapSource(bitmap));
                 SkAutoTUnref<SkBicubicImageFilter> bicubic(
                     SkBicubicImageFilter::CreateMitchell(scale, bmSrc));
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 80f986f867..11ac48869f 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -42,7 +42,7 @@ static void test_frontToBack(skiatest::Reporter* reporter) {
     (void)looper->addLayer(layerInfo);
 
     // Add the back layer, with some layer info set.
-    layerInfo.fOffset.set(SkFloatToScalar(10.0f), SkFloatToScalar(20.0f));
+    layerInfo.fOffset.set(10.0f, 20.0f);
     layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit;
     SkPaint* layerPaint = looper->addLayer(layerInfo);
     layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode);
@@ -55,17 +55,17 @@ static void test_frontToBack(skiatest::Reporter* reporter) {
     // The back layer should come first.
     REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode));
-    canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint);
-    REPORTER_ASSERT(reporter, SkFloatToScalar(10.0f) == device.fLastMatrix.getTranslateX());
-    REPORTER_ASSERT(reporter, SkFloatToScalar(20.0f) == device.fLastMatrix.getTranslateY());
+    canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
+    REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX());
+    REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY());
     paint.reset();
 
     // Then the front layer.
     REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode));
-    canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint);
-    REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateX());
-    REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateY());
+    canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
+    REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX());
+    REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY());
 
     // Only two layers were added, so that should be the end.
     REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint));
@@ -79,7 +79,7 @@ static void test_backToFront(skiatest::Reporter* reporter) {
     (void)looper->addLayerOnTop(layerInfo);
 
     // Add the front layer, with some layer info set.
-    layerInfo.fOffset.set(SkFloatToScalar(10.0f), SkFloatToScalar(20.0f));
+    layerInfo.fOffset.set(10.0f, 20.0f);
     layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit;
     SkPaint* layerPaint = looper->addLayerOnTop(layerInfo);
     layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode);
@@ -92,17 +92,17 @@ static void test_backToFront(skiatest::Reporter* reporter) {
     // The back layer should come first.
     REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode));
-    canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint);
-    REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateX());
-    REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateY());
+    canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
+    REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX());
+    REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY());
     paint.reset();
 
     // Then the front layer.
     REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode));
-    canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint);
-    REPORTER_ASSERT(reporter, SkFloatToScalar(10.0f) == device.fLastMatrix.getTranslateX());
-    REPORTER_ASSERT(reporter, SkFloatToScalar(20.0f) == device.fLastMatrix.getTranslateY());
+    canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
+    REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX());
+    REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY());
 
     // Only two layers were added, so that should be the end.
     REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint));
@@ -116,7 +116,7 @@ static void test_mixed(skiatest::Reporter* reporter) {
     (void)looper->addLayer(layerInfo);
 
     // Add the front layer, with some layer info set.
-    layerInfo.fOffset.set(SkFloatToScalar(10.0f), SkFloatToScalar(20.0f));
+    layerInfo.fOffset.set(10.0f, 20.0f);
     layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit;
     SkPaint* layerPaint = looper->addLayerOnTop(layerInfo);
     layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode);
@@ -129,17 +129,17 @@ static void test_mixed(skiatest::Reporter* reporter) {
     // The back layer should come first.
     REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode));
-    canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint);
-    REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateX());
-    REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateY());
+    canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
+    REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX());
+    REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY());
     paint.reset();
 
     // Then the front layer.
     REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode));
-    canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint);
-    REPORTER_ASSERT(reporter, SkFloatToScalar(10.0f) == device.fLastMatrix.getTranslateX());
-    REPORTER_ASSERT(reporter, SkFloatToScalar(20.0f) == device.fLastMatrix.getTranslateY());
+    canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
+    REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX());
+    REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY());
 
     // Only two layers were added, so that should be the end.
     REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint));
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index cfb96ad8bb..f5c61cbeb8 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -144,7 +144,7 @@ static void test_blend31() {
 
                 float f = float_blend(src, dst, a / 31.f);
                 int r1 = (int)f;
-                int r2 = SkScalarRoundToInt(SkFloatToScalar(f));
+                int r2 = SkScalarRoundToInt(f);
 
                 if (r0 != r1 && r0 != r2) {
                     SkDebugf("src:%d dst:%d a:%d result:%d float:%g\n",
@@ -168,7 +168,7 @@ static void test_blend(skiatest::Reporter* reporter) {
             for (int a = 0; a <= 255; a++) {
                 int r0 = SkAlphaBlend255(src, dst, a);
                 float f1 = float_blend(src, dst, a / 255.f);
-                int r1 = SkScalarRoundToInt(SkFloatToScalar(f1));
+                int r1 = SkScalarRoundToInt(f1);
 
                 if (r0 != r1) {
                     float diff = sk_float_abs(f1 - r1);
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 045c2d22e4..03c93d44c9 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -193,14 +193,14 @@ static void regression_cubic(skiatest::Reporter* reporter) {
     SkPath path, stroke;
     SkPaint paint;
 
-    path.moveTo(SkFloatToScalar(460.2881309415525f),
-                SkFloatToScalar(303.250847066498f));
-    path.cubicTo(SkFloatToScalar(463.36378422175284f),
-                 SkFloatToScalar(302.1169735073363f),
-                 SkFloatToScalar(456.32239330810046f),
-                 SkFloatToScalar(304.720354932878f),
-                 SkFloatToScalar(453.15255460013304f),
-                 SkFloatToScalar(305.788586869862f));
+    path.moveTo(460.2881309415525f,
+                303.250847066498f);
+    path.cubicTo(463.36378422175284f,
+                 302.1169735073363f,
+                 456.32239330810046f,
+                 304.720354932878f,
+                 453.15255460013304f,
+                 305.788586869862f);
 
     SkRect fillR, strokeR;
     fillR = path.getBounds();
@@ -225,13 +225,13 @@ static void regression_cubic(skiatest::Reporter* reporter) {
 static void regression_measureText(skiatest::Reporter* reporter) {
 
     SkPaint paint;
-    paint.setTextSize(SkFloatToScalar(12.0f));
+    paint.setTextSize(12.0f);
 
     SkRect r;
     r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
 
     // test that the rect was reset
-    paint.measureText("", 0, &r, SkFloatToScalar(1.0f));
+    paint.measureText("", 0, &r, 1.0f);
     REPORTER_ASSERT(reporter, r.isEmpty());
 }
 
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index c91186005a..4d0fdba2b8 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -34,8 +34,8 @@ static struct {
     { "", { 0, 0, 0, 0 } },
     { "M0,0L10,10", { 0, 0, SkIntToScalar(10), SkIntToScalar(10) } },
     { "M-5.5,-0.5 Q 0 0 6,6.50",
-        { SkFloatToScalar(-5.5f), SkFloatToScalar(-0.5f),
-          SkFloatToScalar(6), SkFloatToScalar(6.5f) } }
+        { -5.5f, -0.5f,
+          6, 6.5f } }
 };
 
 static void TestParsePath(skiatest::Reporter* reporter) {
@@ -51,13 +51,13 @@ static void TestParsePath(skiatest::Reporter* reporter) {
     }
 
     SkRect r;
-    r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f));
+    r.set(0, 0, 10, 10.5f);
     SkPath p;
     p.addRect(r);
     test_to_from(reporter, p);
     p.addOval(r);
     test_to_from(reporter, p);
-    p.addRoundRect(r, SkFloatToScalar(4), SkFloatToScalar(4.5f));
+    p.addRoundRect(r, 4, 4.5f);
     test_to_from(reporter, p);
 }
 
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp
index 4c26bc17cd..c9acb7ea00 100644
--- a/tests/PathMeasureTest.cpp
+++ b/tests/PathMeasureTest.cpp
@@ -51,7 +51,7 @@ static void test_small_segment() {
     const SkPoint pts[] = {
         { 100000, 100000},
         // big jump between these points, makes a big segment
-        { SkFloatToScalar(1.0005f), SkFloatToScalar(0.9999f) },
+        { 1.0005f, 0.9999f },
         // tiny (non-zero) jump between these points
         { SK_Scalar1, SK_Scalar1 },
     };
@@ -123,7 +123,7 @@ static void TestPathMeasure(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
                             -SK_ScalarHalf,
-                            SkFloatToScalar(0.0001f)));
+                            0.0001f));
     REPORTER_ASSERT(reporter, position.fY == 0);
     REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
@@ -148,26 +148,26 @@ static void TestPathMeasure(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
                             SK_ScalarHalf,
-                            SkFloatToScalar(0.0001f)));
+                            0.0001f));
     REPORTER_ASSERT(reporter, position.fY == 0);
     REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
-    REPORTER_ASSERT(reporter, meas.getPosTan(SkFloatToScalar(2.5f), &position, &tangent));
+    REPORTER_ASSERT(reporter, meas.getPosTan(2.5f, &position, &tangent));
     REPORTER_ASSERT(reporter,
-        SkScalarNearlyEqual(position.fX, SK_Scalar1, SkFloatToScalar(0.0001f)));
+        SkScalarNearlyEqual(position.fX, SK_Scalar1, 0.0001f));
     REPORTER_ASSERT(reporter,
-        SkScalarNearlyEqual(position.fY, SkFloatToScalar(1.5f)));
+        SkScalarNearlyEqual(position.fY, 1.5f));
     REPORTER_ASSERT(reporter, tangent.fX == 0);
     REPORTER_ASSERT(reporter, tangent.fY == SK_Scalar1);
-    REPORTER_ASSERT(reporter, meas.getPosTan(SkFloatToScalar(4.5f), &position, &tangent));
+    REPORTER_ASSERT(reporter, meas.getPosTan(4.5f, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
-                            SkFloatToScalar(2.5f),
-                            SkFloatToScalar(0.0001f)));
+                            2.5f,
+                            0.0001f));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fY,
-                            SkFloatToScalar(2.0f),
-                            SkFloatToScalar(0.0001f)));
+                            2.0f,
+                            0.0001f));
     REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
 
@@ -184,7 +184,7 @@ static void TestPathMeasure(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
                             SK_ScalarHalf,
-                            SkFloatToScalar(0.0001f)));
+                            0.0001f));
     REPORTER_ASSERT(reporter, position.fY == 0);
     REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
@@ -194,12 +194,12 @@ static void TestPathMeasure(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
-                            SkFloatToScalar(1.5f),
-                            SkFloatToScalar(0.0001f)));
+                            1.5f,
+                            0.0001f));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fY,
-                            SkFloatToScalar(2.0f),
-                            SkFloatToScalar(0.0001f)));
+                            2.0f,
+                            0.0001f));
     REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
 
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 080aaada3c..e083ac57ae 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -1151,19 +1151,19 @@ SkPathOp ops[] = {
 };
 
 static void rRect1(skiatest::Reporter* reporter) {
-    SkScalar xA = SkFloatToScalar(0.65f);
-    SkScalar xB = SkFloatToScalar(10.65f);
-    SkScalar xC = SkFloatToScalar(20.65f);
-    SkScalar xD = SkFloatToScalar(30.65f);
-    SkScalar xE = SkFloatToScalar(40.65f);
-    SkScalar xF = SkFloatToScalar(50.65f);
-
-    SkScalar yA = SkFloatToScalar(0.65f);
-    SkScalar yB = SkFloatToScalar(10.65f);
-    SkScalar yC = SkFloatToScalar(20.65f);
-    SkScalar yD = SkFloatToScalar(30.65f);
-    SkScalar yE = SkFloatToScalar(40.65f);
-    SkScalar yF = SkFloatToScalar(50.65f);
+    SkScalar xA = 0.65f;
+    SkScalar xB = 10.65f;
+    SkScalar xC = 20.65f;
+    SkScalar xD = 30.65f;
+    SkScalar xE = 40.65f;
+    SkScalar xF = 50.65f;
+
+    SkScalar yA = 0.65f;
+    SkScalar yB = 10.65f;
+    SkScalar yC = 20.65f;
+    SkScalar yD = 30.65f;
+    SkScalar yE = 40.65f;
+    SkScalar yF = 50.65f;
     SkPath paths[5];
     SkRect rects[5];
     rects[0].set(xB, yB, xE, yE);
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 18d50d005d..131e40ba45 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -833,7 +833,7 @@ static void test_direction(skiatest::Reporter* reporter) {
     // triangle with one point really far from the origin.
     path.reset();
     // the first point is roughly 1.05e10, 1.05e10
-    path.moveTo(SkFloatToScalar(SkBits2Float(0x501c7652)), SkFloatToScalar(SkBits2Float(0x501c7652)));
+    path.moveTo(SkBits2Float(0x501c7652), SkBits2Float(0x501c7652));
     path.lineTo(110 * SK_Scalar1, -10 * SK_Scalar1);
     path.lineTo(-10 * SK_Scalar1, 60 * SK_Scalar1);
     check_direction(reporter, path, SkPath::kCCW_Direction);
@@ -1274,10 +1274,10 @@ static void test_conservativelyContains(skiatest::Reporter* reporter) {
         {kBaseRect, true, true, false, false},
 
         // rect well inside of kBaseRect
-        {SkRect::MakeLTRB(kBaseRect.fLeft + SkFloatToScalar(0.25f)*kBaseRect.width(),
-                          kBaseRect.fTop + SkFloatToScalar(0.25f)*kBaseRect.height(),
-                          kBaseRect.fRight - SkFloatToScalar(0.25f)*kBaseRect.width(),
-                          kBaseRect.fBottom - SkFloatToScalar(0.25f)*kBaseRect.height()),
+        {SkRect::MakeLTRB(kBaseRect.fLeft + 0.25f*kBaseRect.width(),
+                          kBaseRect.fTop + 0.25f*kBaseRect.height(),
+                          kBaseRect.fRight - 0.25f*kBaseRect.width(),
+                          kBaseRect.fBottom - 0.25f*kBaseRect.height()),
                           true, true, true, true},
 
         // rects with edges off by one from kBaseRect's edges
@@ -1382,7 +1382,7 @@ static void test_conservativelyContains(skiatest::Reporter* reporter) {
             // Slightly non-convex shape, shouldn't contain any rects.
             path.reset();
             path.moveTo(0, 0);
-            path.lineTo(SkIntToScalar(50), SkFloatToScalar(0.05f));
+            path.lineTo(SkIntToScalar(50), 0.05f);
             path.lineTo(SkIntToScalar(100), 0);
             path.lineTo(SkIntToScalar(100), SkIntToScalar(100));
             path.lineTo(0, SkIntToScalar(100));
@@ -2962,13 +2962,13 @@ static void test_arcTo(skiatest::Reporter* reporter) {
     p.arcTo(oval, 360, 0, false);
     check_path_is_move_and_reset(reporter, &p, oval.fRight, oval.centerY());
     for (float sweep = 359, delta = 0.5f; sweep != (float) (sweep + delta); ) {
-        p.arcTo(oval, 0, SkFloatToScalar(sweep), false);
+        p.arcTo(oval, 0, sweep, false);
         REPORTER_ASSERT(reporter, p.getBounds() == oval);
         sweep += delta;
         delta /= 2;
     }
     for (float sweep = 361, delta = 0.5f; sweep != (float) (sweep - delta);) {
-        p.arcTo(oval, 0, SkFloatToScalar(sweep), false);
+        p.arcTo(oval, 0, sweep, false);
         REPORTER_ASSERT(reporter, p.getBounds() == oval);
         sweep -= delta;
         delta /= 2;
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp
index 9f91c47c1c..d4b9128b3e 100644
--- a/tests/PointTest.cpp
+++ b/tests/PointTest.cpp
@@ -84,7 +84,7 @@ static float force_as_float(skiatest::Reporter* reporter, float value) {
 // test that we handle very large values correctly. i.e. that we can
 // successfully normalize something whose mag overflows a float.
 static void test_overflow(skiatest::Reporter* reporter) {
-    SkScalar bigFloat = get_value(reporter, SkFloatToScalar(3.4e38f));
+    SkScalar bigFloat = get_value(reporter, 3.4e38f);
     SkPoint pt = { bigFloat, bigFloat };
 
     SkScalar length = pt.length();
@@ -107,7 +107,7 @@ static void test_overflow(skiatest::Reporter* reporter) {
 // test that we handle very small values correctly. i.e. that we can
 // report failure if we try to normalize them.
 static void test_underflow(skiatest::Reporter* reporter) {
-    SkPoint pt = { SkFloatToScalar(1.0e-37f), SkFloatToScalar(1.0e-37f) };
+    SkPoint pt = { 1.0e-37f, 1.0e-37f };
     SkPoint copy = pt;
 
     REPORTER_ASSERT(reporter, 0 == SkPoint::Normalize(&pt));
@@ -127,7 +127,7 @@ DEF_TEST(Point, reporter) {
         SkScalar fLength;
     } gRec[] = {
         { SkIntToScalar(3), SkIntToScalar(4), SkIntToScalar(5) },
-        { SkFloatToScalar(0.6f), SkFloatToScalar(0.8f), SK_Scalar1 },
+        { 0.6f, 0.8f, SK_Scalar1 },
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 95e455d29b..7cadf01871 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -9,8 +9,8 @@
 #include "SkMatrix.h"
 #include "SkRRect.h"
 
-static const SkScalar kWidth = SkFloatToScalar(100.0f);
-static const SkScalar kHeight = SkFloatToScalar(100.0f);
+static const SkScalar kWidth = 100.0f;
+static const SkScalar kHeight = 100.0f;
 
 static void test_inset(skiatest::Reporter* reporter) {
     SkRRect rr, rr2;
@@ -510,7 +510,7 @@ static void test_transform_helper(skiatest::Reporter* reporter, const SkRRect& o
 
     // Scale in both directions.
     SkScalar xScale = SkIntToScalar(3);
-    SkScalar yScale = SkFloatToScalar(3.2f);
+    SkScalar yScale = 3.2f;
     matrix.reset();
     matrix.setScaleX(xScale);
     matrix.setScaleY(yScale);
diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index 8f5b18a6e9..5cffd3aefe 100644
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -86,7 +86,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-7.99f), SkFloatToScalar(-7.99f));
+            mockCanvas.translate(-7.99f, -7.99f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]);
@@ -95,7 +95,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-9.5f), SkFloatToScalar(-9.5f));
+            mockCanvas.translate(-9.5f, -9.5f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 2 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]);
@@ -105,7 +105,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-16.0f), SkFloatToScalar(-16.0f));
+            mockCanvas.translate(-16.0f, -16.0f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
@@ -114,7 +114,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(2.0f), SkFloatToScalar(0.0f));
+            mockCanvas.translate(2.0f, 0.0f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]);
@@ -122,7 +122,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(0.0f), SkFloatToScalar(2.0f));
+            mockCanvas.translate(0.0f, 2.0f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]);
@@ -130,7 +130,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-22.0f), SkFloatToScalar(-16.0f));
+            mockCanvas.translate(-22.0f, -16.0f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
@@ -138,7 +138,7 @@ public:
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-16.0f), SkFloatToScalar(-22.0f));
+            mockCanvas.translate(-16.0f, -22.0f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
@@ -211,7 +211,7 @@ public:
         {
             SkBitmapDevice device(tileBitmap);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-7.9f), SkFloatToScalar(-7.9f));
+            mockCanvas.translate(-7.9f, -7.9f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 2 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]);
@@ -220,7 +220,7 @@ public:
         {
             SkBitmapDevice device(tileBitmap);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-8.1f), SkFloatToScalar(-8.1f));
+            mockCanvas.translate(-8.1f, -8.1f);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 2 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
@@ -232,7 +232,7 @@ public:
             // adjusted region, sitting right on top of the tile boundary.
             SkBitmapDevice device(tinyBitmap);
             MockCanvas mockCanvas(&device);
-            mockCanvas.translate(SkFloatToScalar(-8.0f), SkFloatToScalar(-8.0f));
+            mockCanvas.translate(-8.0f, -8.0f);
             picture.draw(&mockCanvas);
             // This test passes by not asserting. We do not validate the rects recorded
             // because the result is numerically unstable (floating point equality).