remove SkFloatToScalar macro

gm/complexclip.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 "SkParsePath.h"
@@ skipping 82 matching lines @@
         };
 
         canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
         canvas->scale(3 * SK_Scalar1 / 4, 3 * SK_Scalar1 / 4);
 
         if (fDoSaveLayer) {
             // We want the layer to appear symmetric relative to actual
             // device boundaries so we need to "undo" the effect of the
             // scale and translate
             SkRect bounds = SkRect::MakeLTRB(
-              SkFloatToScalar(4.0f/3.0f * -20),
-              SkFloatToScalar(4.0f/3.0f * -20),
-              SkFloatToScalar(4.0f/3.0f * (this->getISize().fWidth - 20)),
-              SkFloatToScalar(4.0f/3.0f * (this->getISize().fHeight - 20)));
+              4.0f/3.0f * -20,
+              4.0f/3.0f * -20,
+              4.0f/3.0f * (this->getISize().fWidth - 20),
+              4.0f/3.0f * (this->getISize().fHeight - 20));
 
             bounds.inset(SkIntToScalar(100), SkIntToScalar(100));
             SkPaint boundPaint;
             boundPaint.setColor(SK_ColorRED);
             boundPaint.setStyle(SkPaint::kStroke_Style);
             canvas->drawRect(bounds, boundPaint);
             canvas->saveLayer(&bounds, NULL);
         }
 
         for (int invBits = 0; invBits < 4; ++invBits) {
@@ skipping 71 matching lines @@
 // aliased and anti-aliased w/ a layer
 static GM* gFact2(void*) { return new ComplexClipGM(false, true); }
 static GM* gFact3(void*) { return new ComplexClipGM(true, true); }
 
 static GMRegistry gReg0(gFact0);
 static GMRegistry gReg1(gFact1);
 static GMRegistry gReg2(gFact2);
 static GMRegistry gReg3(gFact3);
 
 }