remove SkFloatToScalar macro

src/gpu/GrPathUtils.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 "GrPathUtils.h"
 
 #include "GrPoint.h"
@@ skipping 16 matching lines @@
                              (i < 2) ? pathBounds.fTop : pathBounds.fBottom);
             mat.postConcat(viewM);
             stretch = SkMaxScalar(stretch, mat.mapRadius(SK_Scalar1));
         }
     }
     srcTol = SkScalarDiv(srcTol, stretch);
     return srcTol;
 }
 
 static const int MAX_POINTS_PER_CURVE = 1 << 10;
-static const SkScalar gMinCurveTol = SkFloatToScalar(0.0001f);
+static const SkScalar gMinCurveTol = 0.0001f;
 
 uint32_t GrPathUtils::quadraticPointCount(const GrPoint points[],
                                           SkScalar tol) {
     if (tol < gMinCurveTol) {
         tol = gMinCurveTol;
     }
     SkASSERT(tol > 0);
 
     SkScalar d = points[1].distanceToLineSegmentBetween(points[0], points[2]);
     if (d <= tol) {
@@ skipping 195 matching lines @@
         } else {
             // It's a point. It should cover zero area. Just set the matrix such
             // that (u, v) will always be far away from the quad.
             fM[0] = 0; fM[1] = 0; fM[2] = 100.f;
             fM[3] = 0; fM[4] = 0; fM[5] = 100.f;
         }
     } else {
         m.postConcat(UVpts);
 
         // The matrix should not have perspective.
-        SkDEBUGCODE(static const SkScalar gTOL = SkFloatToScalar(1.f / 100.f));
+        SkDEBUGCODE(static const SkScalar gTOL = 1.f / 100.f);
         SkASSERT(SkScalarAbs(m.get(SkMatrix::kMPersp0)) < gTOL);
         SkASSERT(SkScalarAbs(m.get(SkMatrix::kMPersp1)) < gTOL);
 
         // It may not be normalized to have 1.0 in the bottom right
         float m33 = m.get(SkMatrix::kMPersp2);
         if (1.f != m33) {
             m33 = 1.f / m33;
             fM[0] = m33 * m.get(SkMatrix::kMScaleX);
             fM[1] = m33 * m.get(SkMatrix::kMSkewX);
             fM[2] = m33 * m.get(SkMatrix::kMTransX);
@@ skipping 567 matching lines @@
         set_loop_klm(d, controlK, controlL, controlM);
     } else if (kCusp_CubicType == cType) {
         SkASSERT(0.f == d[0]);
         set_cusp_klm(d, controlK, controlL, controlM);
     } else if (kQuadratic_CubicType == cType) {
         set_quadratic_klm(d, controlK, controlL, controlM);
     }
 
     calc_cubic_klm(p, controlK, controlL, controlM, klm, &klm[3], &klm[6]);
 }