remove SkFloatToScalar macro

gm/shaderbounds.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 "gm.h"
 #include "SkGradientShader.h"
 
 namespace skiagm {
@@ skipping 23 matching lines @@
 
 protected:
     SkString onShortName() {
         return fName;
     }
 
     virtual SkISize onISize() { return make_isize(320, 240); }
 
     virtual SkMatrix onGetInitialTransform() const SK_OVERRIDE {
         SkMatrix result;
-        SkScalar scale = SkFloatToScalar(0.8f);
+        SkScalar scale = 0.8f;
         result.setScale(scale, scale);
         result.postTranslate(SkIntToScalar(7), SkIntToScalar(23));
         return result;
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         // The PDF device has already clipped to the content area, but we
         // do it again here so that the raster and pdf results are consistent.
         canvas->clipRect(SkRect::MakeWH(SkIntToScalar(320),
                                         SkIntToScalar(240)));
 
         SkMatrix canvasScale;
-        SkScalar scale = SkFloatToScalar(0.7f);
+        SkScalar scale = 0.7f;
         canvasScale.setScale(scale, scale);
         canvas->concat(canvasScale);
 
         // Background shader.
         SkPaint paint;
         paint.setShader(MakeShader(559, 387, false))->unref();
         SkRect r = SkRect::MakeXYWH(SkIntToScalar(-12), SkIntToScalar(-41),
                                     SkIntToScalar(571), SkIntToScalar(428));
         canvas->drawRect(r, paint);
 
         // Constrained shader.
         paint.setShader(MakeShader(101, 151, true))->unref();
         r = SkRect::MakeXYWH(SkIntToScalar(43), SkIntToScalar(71),
                              SkIntToScalar(101), SkIntToScalar(151));
         canvas->clipRect(r);
         canvas->drawRect(r, paint);
     }
 
     SkShader* MakeShader(int width, int height, bool background) {
-        SkScalar scale = SkFloatToScalar(0.5f);
+        SkScalar scale = 0.5f;
         if (background) {
-            scale = SkFloatToScalar(0.6f);
+            scale = 0.6f;
         }
         SkScalar shaderWidth = SkScalarDiv(SkIntToScalar(width), scale);
         SkScalar shaderHeight = SkScalarDiv(SkIntToScalar(height), scale);
         SkShader* shader = fShaderMaker(shaderWidth, shaderHeight, background);
         SkMatrix shaderScale;
         shaderScale.setScale(scale, scale);
         shader->setLocalMatrix(shaderScale);
         return shader;
     }
 
 private:
     typedef GM INHERITED;
 
     ShaderGenFunc fShaderMaker;
     SkString fName;
 
     SkShader* MakeShader(bool background);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) {
     return new ShaderBoundsGM(MakeLinear, SkString("shaderbounds_linear"));
 }
 static GMRegistry reg(MyFactory);
 
 }