remove SkFloatToScalar macro

tests/PathOpsOpTest.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 "PathOpsExtendedTest.h"
 
 #define TEST(name) { name, #name }
 
@@ skipping 1133 matching lines @@
 
 SkPathOp ops[] = {
     kUnion_PathOp,
     kXOR_PathOp,
     kReverseDifference_PathOp,
     kXOR_PathOp,
     kReverseDifference_PathOp,
 };
 
 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 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 = 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 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);
     paths[0].addRoundRect(rects[0], SkIntToScalar(5), SkIntToScalar(5));  // red
     rects[1].set(xA, yA, xD, yD);
     paths[1].addRoundRect(rects[1], SkIntToScalar(5), SkIntToScalar(5));  // green
     rects[2].set(xC, yA, xF, yD);
     paths[2].addRoundRect(rects[2], SkIntToScalar(5), SkIntToScalar(5));  // blue
     rects[3].set(xA, yC, xD, yF);
     paths[3].addRoundRect(rects[3], SkIntToScalar(5), SkIntToScalar(5));  // yellow
@@ skipping 2124 matching lines @@
         RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
     }
 #ifdef SK_DEBUG
     SkPathOpsDebug::gMaxWindSum = SK_MaxS32;
     SkPathOpsDebug::gMaxWindValue = SK_MaxS32;
 #endif
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS_SHORT(PathOpsOpTest)