remove SkFloatToScalar macro

gm/hairlines.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkTArray.h"
@@ skipping 77 matching lines @@
             problem1->moveTo(SkIntToScalar(4), SkIntToScalar(6));
             problem1->cubicTo(SkIntToScalar(5), SkIntToScalar(6),
                               SkIntToScalar(5), SkIntToScalar(4),
                               SkIntToScalar(4), SkIntToScalar(0));
             problem1->close();
         }
 
         {
             SkPath* problem2 = &fPaths.push_back();
             problem2->moveTo(SkIntToScalar(5), SkIntToScalar(1));
-            problem2->lineTo(SkFloatToScalar(4.32787323f), SkFloatToScalar(1.67212653f));
-            problem2->cubicTo(SkFloatToScalar(2.75223875f), SkFloatToScalar(3.24776125f),
-                              SkFloatToScalar(3.00581908f), SkFloatToScalar(4.51236057f),
-                              SkFloatToScalar(3.7580452f), SkFloatToScalar(4.37367964f));
-            problem2->cubicTo(SkFloatToScalar(4.66472578f), SkFloatToScalar(3.888381f),
-                              SkFloatToScalar(5.f), SkFloatToScalar(2.875f),
-                              SkFloatToScalar(5.f), SkFloatToScalar(1.f));
+            problem2->lineTo(4.32787323f, 1.67212653f);
+            problem2->cubicTo(2.75223875f, 3.24776125f,
+                              3.00581908f, 4.51236057f,
+                              3.7580452f, 4.37367964f);
+            problem2->cubicTo(4.66472578f, 3.888381f,
+                              5.f, 2.875f,
+                              5.f, 1.f);
             problem2->close();
         }
 
         // Three paths that show the same bug (missing end caps)
         {
             // A caret (crbug.com/131770)
             SkPath* bug0 = &fPaths.push_back();
             bug0->moveTo(6.5f,5.5f);
             bug0->lineTo(3.5f,0.5f);
             bug0->moveTo(0.5f,5.5f);
@@ skipping 15 matching lines @@
             SkPath* bug2 = &fPaths.push_back();
 
             bug2->moveTo(5.5f, 5.5f);
             bug2->lineTo(5.5f, 0.5f);
             bug2->lineTo(0.5f, 0.5f);
         }
 
         {
             // Arc example to test imperfect truncation bug (crbug.com/295626)
             static const SkScalar kRad = SkIntToScalar(2000);
-            static const SkScalar kStartAngle = SkFloatToScalar(262.59717f);
-            static const SkScalar kSweepAngle = SkScalarHalf(SkFloatToScalar(17.188717f));
+            static const SkScalar kStartAngle = 262.59717f;
+            static const SkScalar kSweepAngle = SkScalarHalf(17.188717f);
 
             SkPath* bug = &fPaths.push_back();
 
             // Add a circular arc
             SkRect circle = SkRect::MakeLTRB(-kRad, -kRad, kRad, kRad);
             bug->addArc(circle, kStartAngle, kSweepAngle);
 
             // Now add the chord that should cap the circular arc
             SkScalar cosV, sinV = SkScalarSinCos(SkDegreesToRadians(kStartAngle), &cosV);
 
@@ skipping 60 matching lines @@
     SkTArray<SkPath> fPaths;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new HairlinesGM; }
 static GMRegistry reg(MyFactory);
 
 }