remove SkFloatToScalar macro

gm/blurroundrect.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 93 matching lines @@
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(750, 750);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->scale(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f));
+        canvas->scale(1.5f, 1.5f);
 
         const int blurRadii[] = { 1, 3, 6, 10 };
         const int cornerRadii[] = { 1, 3, 6, 10 };
         const SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
         for (size_t i = 0; i < SK_ARRAY_COUNT(blurRadii); ++i) {
             SkAutoCanvasRestore autoRestore(canvas, true);
             canvas->translate(0, (r.height() + SkIntToScalar(20)) * i);
             for (size_t j = 0; j < SK_ARRAY_COUNT(cornerRadii); ++j) {
                 SkMaskFilter* filter = SkBlurMaskFilter::Create(
                     SkBlurMaskFilter::kNormal_BlurStyle,
@@ skipping 20 matching lines @@
 // TODO(scroggo): Disabled in an attempt to rememdy
 // https://code.google.com/p/skia/issues/detail?id=1801 ('Win7 Test bots all failing GenerateGMs:
 // ran wrong number of tests')
 //DEF_GM(return new BlurRoundRectGM(600, 5514, 6);)
 
 // Rounded rect with two opposite corners with large radii, the other two
 // small.
 DEF_GM(return new BlurRoundRectGM(100, 100);)
 
 DEF_GM(return new SimpleBlurRoundRectGM();)