remove SkFloatToScalar macro

tests/TileGridTest.cpp

 /*
  * Copyright 2012 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 "SkBitmapDevice.h"
 #include "SkCanvas.h"
@@ skipping 68 matching lines @@
         {
             SkBitmapDevice device(store);
             MockCanvas mockCanvas(&device);
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]);
         }
         {
             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]);
         }
         // Corner overlap
         {
             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]);
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[1]);
         }
         // Intersect bottom right tile, but does not overlap rect 2
         {
             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]);
         }
         // Out of bounds queries, snap to border tiles
         {
             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]);
         }
         {
             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]);
         }
         {
             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]);
         }
         {
             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]);
         }
     }
 
     static void TestOverlapOffsetQueryAlignment(skiatest::Reporter* reporter) {
         // Use SkTileGridPicture to generate a SkTileGrid with a helper
         SkTileGridPicture::TileGridInfo info;
         info.fMargin.set(1, 1);
@@ skipping 52 matching lines @@
             SkBitmapDevice device(tileBitmap);
             MockCanvas mockCanvas(&device);
             mockCanvas.translate(SkIntToScalar(-8), SkIntToScalar(-8));
             picture.draw(&mockCanvas);
             REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
         }
         {
             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]);
             REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[1]);
         }
         {
             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]);
             REPORTER_ASSERT(reporter, rect3 == mockCanvas.fRects[1]);
         }
         {
             // Regression test for crbug.com/234688
             // Once the 2x2 device region is inset by margin, it yields an empty
             // 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).
             // The content of any one of the four tiles of the tilegrid would be a valid
             // result since any bbox that covers the center point of the canvas will be
             // recorded in all four tiles.
         }
     }
 
     static void Test(skiatest::Reporter* reporter) {
@@ skipping 24 matching lines @@
         verifyTileHits(reporter, SkIRect::MakeXYWH(5, 5, 10, 10),  kAll_Tile);
         verifyTileHits(reporter, SkIRect::MakeXYWH(-10, -10, 40, 40),  kAll_Tile);
 
         TestUnalignedQuery(reporter);
         TestOverlapOffsetQueryAlignment(reporter);
     }
 };
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("TileGrid", TileGridTestClass, TileGridTest::Test)