partial switch over to sp usage of shaders

gm/filltypespersp.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 "SkGradientShader.h"
 #include "SkPath.h"
@@ skipping 37 matching lines @@
         canvas->translate(-r.centerX(), -r.centerY());
         canvas->drawPath(fPath, paint);
         canvas->restore();
     }
 
     void showFour(SkCanvas* canvas, SkScalar scale, bool aa) {
         SkPaint paint;
         SkPoint center = SkPoint::Make(SkIntToScalar(100), SkIntToScalar(100));
         SkColor colors[] = {SK_ColorBLUE, SK_ColorRED, SK_ColorGREEN};
         SkScalar pos[] = {0, SK_ScalarHalf, SK_Scalar1};
-        SkShader* s = SkGradientShader::CreateRadial(center,
+        paint.setShader(SkGradientShader::MakeRadial(center,
                                                      SkIntToScalar(100),
                                                      colors,
                                                      pos,
                                                      SK_ARRAY_COUNT(colors),
-                                                     SkShader::kClamp_TileMode);
-        paint.setShader(s)->unref();
+                                                     SkShader::kClamp_TileMode));
         paint.setAntiAlias(aa);
 
         showPath(canvas,   0,   0, SkPath::kWinding_FillType,
                  scale, paint);
         showPath(canvas, 200,   0, SkPath::kEvenOdd_FillType,
                  scale, paint);
         showPath(canvas,  00, 200, SkPath::kInverseWinding_FillType,
                  scale, paint);
         showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
                  scale, paint);
     }
 
     void onDraw(SkCanvas* canvas) override {
         this->makePath();
 
         // do perspective drawPaint as the background;
         SkPaint bkgnrd;
         SkPoint center = SkPoint::Make(SkIntToScalar(100),
                                        SkIntToScalar(100));
         SkColor colors[] = {SK_ColorBLACK, SK_ColorCYAN,
                             SK_ColorYELLOW, SK_ColorWHITE};
         SkScalar pos[] = {0, SK_ScalarHalf / 2,
                           3 * SK_ScalarHalf / 2, SK_Scalar1};
-        SkShader* s = SkGradientShader::CreateRadial(center,
-                                                     SkIntToScalar(1000),
-                                                     colors,
-                                                     pos,
-                                                     SK_ARRAY_COUNT(colors),
-                                                     SkShader::kClamp_TileMode);
-        bkgnrd.setShader(s)->unref();
+        bkgnrd.setShader(SkGradientShader::MakeRadial(center,
+                                                      SkIntToScalar(1000),
+                                                      colors,
+                                                      pos,
+                                                      SK_ARRAY_COUNT(colors),
+                                                      SkShader::kClamp_TileMode));
         canvas->save();
             canvas->translate(SkIntToScalar(100), SkIntToScalar(100));
             SkMatrix mat;
             mat.reset();
             mat.setPerspY(SK_Scalar1 / 1000);
             canvas->concat(mat);
             canvas->drawPaint(bkgnrd);
         canvas->restore();
 
         // draw the paths in perspective
@@ skipping 19 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FillTypePerspGM; }
 static GMRegistry reg(MyFactory);
 
 }