partial switch over to sp usage of shaders

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 74 matching lines @@
     SkRRect         fRRect;
     int             fWidth, fHeight;
 
     typedef skiagm::GM INHERITED;
 };
 
 #include "SkGradientShader.h"
 /*
  * Spits out a dummy gradient to test blur with shader on paint
  */
-static SkShader* MakeRadial() {
+static sk_sp<SkShader> MakeRadial() {
     SkPoint pts[2] = {
         { 0, 0 },
         { SkIntToScalar(100), SkIntToScalar(100) }
     };
     SkShader::TileMode tm = SkShader::kClamp_TileMode;
     const SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, };
     const SkScalar pos[] = { SK_Scalar1/4, SK_Scalar1*3/4 };
     SkMatrix scale;
     scale.setScale(0.5f, 0.5f);
     scale.postTranslate(5.f, 5.f);
     SkPoint center0, center1;
     center0.set(SkScalarAve(pts[0].fX, pts[1].fX),
                 SkScalarAve(pts[0].fY, pts[1].fY));
     center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5),
                 SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
-    return SkGradientShader::CreateTwoPointConical(center1, (pts[1].fX - pts[0].fX) / 7,
-                                                   center0, (pts[1].fX - pts[0].fX) / 2,
-                                                   colors, pos, SK_ARRAY_COUNT(colors), tm,
-                                                   0, &scale);
+    return SkGradientShader::MakeTwoPointConical(center1, (pts[1].fX - pts[0].fX) / 7,
+                                                 center0, (pts[1].fX - pts[0].fX) / 2,
+                                                 colors, pos, SK_ARRAY_COUNT(colors), tm,
+                                                 0, &scale);
 }
 
 // Simpler blurred RR test cases where all the radii are the same.
 class SimpleBlurRoundRectGM : public skiagm::GM {
 public:
     SimpleBlurRoundRectGM()
         : fName("simpleblurroundrect") {
     }
 
 protected:
@@ skipping 21 matching lines @@
                     SkMaskFilter* filter = SkBlurMaskFilter::Create(
                         kNormal_SkBlurStyle,
                         SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])),
                         SkBlurMaskFilter::kHighQuality_BlurFlag);
                     SkPaint paint;
                     paint.setColor(SK_ColorBLACK);
                     paint.setMaskFilter(filter)->unref();
 
                     bool useRadial = SkToBool(k);
                     if (useRadial) {
-                        paint.setShader(MakeRadial())->unref();
+                        paint.setShader(MakeRadial());
                     }
 
                     SkRRect rrect;
                     rrect.setRectXY(r, SkIntToScalar(cornerRadii[j]),
                                     SkIntToScalar(cornerRadii[j]));
                     canvas->drawRRect(rrect, paint);
                     canvas->translate(r.width() + SkIntToScalar(50), 0);
                 }
             }
         }
     }
 private:
     const SkString  fName;
 
     typedef         skiagm::GM INHERITED;
 };
 
 // Create one with dimensions/rounded corners based on the skp
 //
 // 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();)