remove SkFloatToScalar macro

tests/DrawBitmapRectTest.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 "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 102 matching lines @@
         rand_matrix(&mat, rand, SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask);
         for (int j = 0; j < 1000; ++j) {
             rand_size(&size, rand);
             REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, 0));
             REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits));
         }
     }
 
     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);
     REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits));
 
     const SkScalar twoThirds = SK_Scalar1 * 2 / 3;
     const SkScalar bigScale = SkScalarDiv(size.width() + twoThirds, size.width());
     mat.setScale(bigScale, bigScale);
     REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, false));
     REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits));
@@ skipping 34 matching lines @@
 static void test_wacky_bitmapshader(skiatest::Reporter* reporter,
                                     int width, int height, bool shouldBeDrawn) {
     SkBitmap dev;
     dev.setConfig(SkBitmap::kARGB_8888_Config, 0x56F, 0x4f6);
     dev.allocPixels();
     dev.eraseColor(SK_ColorTRANSPARENT);  // necessary, so we know if we draw to it
 
     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);
 
     SkBitmap bm;
     bm.setConfig(SkBitmap::kARGB_8888_Config, width, height);
     bm.allocPixels();
     bm.eraseColor(SK_ColorRED);
 
     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);
 
     SkPaint paint;
     paint.setShader(s)->unref();
 
     SkRect r = SkRect::MakeXYWH(681, 239, 695, 253);
     c.drawRect(r, paint);
 
@@ skipping 105 matching lines @@
 
     test_nan_antihair();
     test_giantrepeat_crbug118018(reporter);
 
     test_treatAsSprite(reporter);
     test_faulty_pixelref(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("DrawBitmapRect", TestDrawBitmapRectClass, TestDrawBitmapRect)