remove SkFloatToScalar macro

tests/ParsePathTest.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 "SkParsePath.h"
 
@@ skipping 16 matching lines @@
 #endif
 }
 
 static struct {
     const char* fStr;
     const SkRect fBounds;
 } gRec[] = {
     { "", { 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) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
         SkPath  path;
         bool success = SkParsePath::FromSVGString(gRec[i].fStr, &path);
         REPORTER_ASSERT(reporter, success);
         const SkRect& expectedBounds = gRec[i].fBounds;
         const SkRect& pathBounds = path.getBounds();
         REPORTER_ASSERT(reporter, expectedBounds == pathBounds);
 
         test_to_from(reporter, path);
     }
 
     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);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("ParsePath", ParsePathClass, TestParsePath)