remove SkFloatToScalar macro

gm/complexclip2.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 
 namespace skiagm {
 
 class ComplexClip2GM : public GM {
 public:
     ComplexClip2GM(bool doPaths, bool antiAlias)
     : fDoPaths(doPaths)
     , fAntiAlias(antiAlias) {
         this->setBGColor(SkColorSetRGB(0xDD,0xA0,0xDD));
 
         // offset the rects a bit so we get antialiasing even in the rect case
-        SkScalar xA = SkFloatToScalar(0.65f);
-        SkScalar xB = SkFloatToScalar(10.65f);
-        SkScalar xC = SkFloatToScalar(20.65f);
-        SkScalar xD = SkFloatToScalar(30.65f);
-        SkScalar xE = SkFloatToScalar(40.65f);
-        SkScalar xF = SkFloatToScalar(50.65f);
+        SkScalar xA = 0.65f;
+        SkScalar xB = 10.65f;
+        SkScalar xC = 20.65f;
+        SkScalar xD = 30.65f;
+        SkScalar xE = 40.65f;
+        SkScalar xF = 50.65f;
 
-        SkScalar yA = SkFloatToScalar(0.65f);
-        SkScalar yB = SkFloatToScalar(10.65f);
-        SkScalar yC = SkFloatToScalar(20.65f);
-        SkScalar yD = SkFloatToScalar(30.65f);
-        SkScalar yE = SkFloatToScalar(40.65f);
-        SkScalar yF = SkFloatToScalar(50.65f);
+        SkScalar yA = 0.65f;
+        SkScalar yB = 10.65f;
+        SkScalar yC = 20.65f;
+        SkScalar yD = 30.65f;
+        SkScalar yE = 40.65f;
+        SkScalar yF = 50.65f;
 
         fWidth = xF - xA;
         fHeight = yF - yA;
 
         fRects[0].set(xB, yB, xE, yE);
         fPaths[0].addRoundRect(fRects[0], SkIntToScalar(5), SkIntToScalar(5));
         fRectColors[0] = SK_ColorRED;
 
         fRects[1].set(xA, yA, xD, yD);
         fPaths[1].addRoundRect(fRects[1], SkIntToScalar(5), SkIntToScalar(5));
@@ skipping 126 matching lines @@
 
 // aa rects
 static GM* MyFactory3(void*) { return new ComplexClip2GM(false, true); }
 static GMRegistry reg3(MyFactory3);
 
 // aa paths
 static GM* MyFactory4(void*) { return new ComplexClip2GM(true, true); }
 static GMRegistry reg4(MyFactory4);
 
 }