deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

samplecode/SampleLayerMask.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 "SampleCode.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 16 matching lines @@
         }
         return this->INHERITED::onQuery(evt);
     }
 
     void drawMask(SkCanvas* canvas, const SkRect& r) {
         SkPaint paint;
         paint.setAntiAlias(true);
 
         if (true) {
             SkBitmap mask;
-            int w = SkScalarRound(r.width());
-            int h = SkScalarRound(r.height());
+            int w = SkScalarRoundToInt(r.width());
+            int h = SkScalarRoundToInt(r.height());
             mask.setConfig(SkBitmap::kARGB_8888_Config, w, h);
             mask.allocPixels();
             mask.eraseColor(SK_ColorTRANSPARENT);
             SkCanvas c(mask);
             SkRect bounds = r;
             bounds.offset(-bounds.fLeft, -bounds.fTop);
             c.drawOval(bounds, paint);
 
             paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
             canvas->drawBitmap(mask, r.fLeft, r.fTop, &paint);
@@ skipping 16 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new LayerMaskView; }
 static SkViewRegister reg(MyFactory);