partial switch over to sp usage of shaders

gm/colorfilterimagefilter.cpp

 /*
  * Copyright 2012 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 "SkColorMatrixFilter.h"
@@ skipping 35 matching lines @@
     *array->append() = cf_make_brightness(0.5f);
     *array->append() = cf_make_grayscale();
     *array->append() = cf_make_colorize(SK_ColorBLUE);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "SkGradientShader.h"
 #include "SkImage.h"
 #include "Resources.h"
 
-static SkShader* sh_make_lineargradient0() {
+static sk_sp<SkShader> sh_make_lineargradient0() {
     const SkPoint pts[] = { { 0, 0 }, { 100, 100 } };
     const SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
-    return SkGradientShader::CreateLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode);
+    return SkGradientShader::MakeLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode);
 }
 
-static SkShader* sh_make_lineargradient1() {
+static sk_sp<SkShader> sh_make_lineargradient1() {
     const SkPoint pts[] = { { 0, 0 }, { 100, 100 } };
     const SkColor colors[] = { SK_ColorRED, 0x0000FF00, SK_ColorBLUE };
-    return SkGradientShader::CreateLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode);
+    return SkGradientShader::MakeLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode);
 }
 
-static SkShader* sh_make_image() {
+static sk_sp<SkShader> sh_make_image() {
     SkAutoTUnref<SkImage> image(GetResourceAsImage("mandrill_128.png"));
     if (!image) {
         return nullptr;
     }
-    return image->newShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
+    return sk_sp<SkShader>(image->newShader(SkShader::kRepeat_TileMode,
+                                            SkShader::kRepeat_TileMode));
 }
 
 static void sk_gm_get_shaders(SkTDArray<SkShader*>* array) {
-    if (SkShader* shader = sh_make_lineargradient0()) {
-        *array->append() = shader;
+    if (auto shader = sh_make_lineargradient0()) {
+        *array->append() = shader.release();
     }
-    if (SkShader* shader = sh_make_lineargradient1()) {
-        *array->append() = shader;
+    if (auto shader = sh_make_lineargradient1()) {
+        *array->append() = shader.release();
     }
-    if (SkShader* shader = sh_make_image()) {
-        *array->append() = shader;
+    if (auto shader = sh_make_image()) {
+        *array->append() = shader.release();
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 static SkImageFilter* make_blur(float amount, SkImageFilter* input = nullptr) {
     return SkBlurImageFilter::Create(amount, amount, input);
 }
 
 static SkImageFilter* make_brightness(float amount, SkImageFilter* input = nullptr) {
@@ skipping 118 matching lines @@
             SkColorFilter* filter = x >= 0 ? filters[x] : nullptr;
 
             paint.setShader(shader->newWithColorFilter(filter))->unref();
             canvas->drawRect(r, paint);
             canvas->translate(150, 0);
         }
         canvas->restore();
         canvas->translate(0, 150);
     }
 }