remove SkFloatToScalar macro

tests/RoundRectTest.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 "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;
     SkRect r = { 0, 0, 100, 100 };
 
     rr.setRect(r);
     rr.inset(-20, -20, &rr2);
     REPORTER_ASSERT(reporter, rr2.isRect());
 
     rr.inset(20, 20, &rr2);
@@ skipping 479 matching lines @@
         REPORTER_ASSERT(reporter, origLL == dstUR);
     }
     // Width and height remain the same.
     REPORTER_ASSERT(reporter, orig.rect().width() == dst.rect().width());
     REPORTER_ASSERT(reporter, orig.rect().height() == dst.rect().height());
     REPORTER_ASSERT(reporter, orig.rect().top() == -dst.rect().bottom());
     REPORTER_ASSERT(reporter, orig.rect().right() == -dst.rect().left());
 
     // 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);
     dst.setEmpty();
     success = orig.transform(matrix, &dst);
     REPORTER_ASSERT(reporter, success);
     // Radii are scaled.
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter, SkScalarNearlyEqual(dst.radii((SkRRect::Corner) i).fX,
                                     SkScalarMul(orig.radii((SkRRect::Corner) i).fX, xScale)));
@@ skipping 35 matching lines @@
     test_round_rect_ovals(reporter);
     test_round_rect_general(reporter);
     test_round_rect_iffy_parameters(reporter);
     test_inset(reporter);
     test_round_rect_contains_rect(reporter);
     test_round_rect_transform(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("RoundRect", TestRoundRectClass, TestRoundRect)