remove SkFloatToScalar macro

tests/PaintTest.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 175 matching lines @@
     REPORTER_ASSERT(reporter, memcmp(&cleanPaint, &copiedPaint, sizeof(cleanPaint)));
 #endif
 }
 
 // found and fixed for webkit: mishandling when we hit recursion limit on
 // mostly degenerate cubic flatness test
 static void regression_cubic(skiatest::Reporter* reporter) {
     SkPath path, stroke;
     SkPaint paint;
 
-    path.moveTo(SkFloatToScalar(460.2881309415525f),
-                SkFloatToScalar(303.250847066498f));
-    path.cubicTo(SkFloatToScalar(463.36378422175284f),
-                 SkFloatToScalar(302.1169735073363f),
-                 SkFloatToScalar(456.32239330810046f),
-                 SkFloatToScalar(304.720354932878f),
-                 SkFloatToScalar(453.15255460013304f),
-                 SkFloatToScalar(305.788586869862f));
+    path.moveTo(460.2881309415525f,
+                303.250847066498f);
+    path.cubicTo(463.36378422175284f,
+                 302.1169735073363f,
+                 456.32239330810046f,
+                 304.720354932878f,
+                 453.15255460013304f,
+                 305.788586869862f);
 
     SkRect fillR, strokeR;
     fillR = path.getBounds();
 
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(2));
     paint.getFillPath(path, &stroke);
     strokeR = stroke.getBounds();
 
     SkRect maxR = fillR;
     SkScalar miter = SkMaxScalar(SK_Scalar1, paint.getStrokeMiter());
     SkScalar inset = paint.getStrokeJoin() == SkPaint::kMiter_Join ?
                             SkScalarMul(paint.getStrokeWidth(), miter) :
                             paint.getStrokeWidth();
     maxR.inset(-inset, -inset);
 
     // test that our stroke didn't explode
     REPORTER_ASSERT(reporter, maxR.contains(strokeR));
 }
 
 // found and fixed for android: not initializing rect for string's of length 0
 static void regression_measureText(skiatest::Reporter* reporter) {
 
     SkPaint paint;
-    paint.setTextSize(SkFloatToScalar(12.0f));
+    paint.setTextSize(12.0f);
 
     SkRect r;
     r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
 
     // test that the rect was reset
-    paint.measureText("", 0, &r, SkFloatToScalar(1.0f));
+    paint.measureText("", 0, &r, 1.0f);
     REPORTER_ASSERT(reporter, r.isEmpty());
 }
 
 static void TestPaint(skiatest::Reporter* reporter) {
     // TODO add general paint tests
     test_copy(reporter);
 
     // regression tests
     regression_cubic(reporter);
     regression_measureText(reporter);
 
     test_filterlevel(reporter);
 
     // need to implement charsToGlyphs on other backends (e.g. linux, win)
     // before we can run this tests everywhere
     if (false) {
        test_cmap(reporter);
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Paint", TestPaintClass, TestPaint)