Reland of "more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium…

gm/textbloblooper.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 "Sk2DPathEffect.h"
@@ skipping 62 matching lines @@
     SkPath path;
     path.addCircle(0, 0, SkIntToScalar(5));
 
     return SkPath2DPathEffect::Create(m, path);
 }
 
 static void path_effect(SkPaint* paint) {
     paint->setPathEffect(make_tile_effect())->unref();
 }
 
-static SkShader* make_shader(const SkRect& bounds) {
+static sk_sp<SkShader> make_shader(const SkRect& bounds) {
     const SkPoint pts[] = {
         { bounds.left(), bounds.top() },
         { bounds.right(), bounds.bottom() },
     };
     const SkColor colors[] = {
         SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorBLACK,
         SK_ColorCYAN, SK_ColorMAGENTA, SK_ColorYELLOW,
     };
-    return SkGradientShader::CreateLinear(pts,
-                                          colors, nullptr, SK_ARRAY_COUNT(colors),
-                                          SkShader::kClamp_TileMode);
+    return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors),
+                                        SkShader::kClamp_TileMode);
 }
 
 static void color_filter(SkPaint* paint) {
     SkRect r;
     r.setWH(SkIntToScalar(kWidth), 50);
-    paint->setShader(make_shader(r))->unref();
+    paint->setShader(make_shader(r));
     paint->setColorFilter(SkColorMatrixFilter::CreateLightingFilter(0xF0F0F0, 0))->unref();
 }
 
 static void kitchen_sink(SkPaint* paint) {
     color_filter(paint);
     path_effect(paint);
     mask_filter(paint);
 
 }
 
@@ skipping 139 matching lines @@
     SkAutoTUnref<const SkTextBlob> fBlob;
     SkTArray<SkAutoTUnref<SkLayerDrawLooper>, true> fLoopers;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new TextBlobLooperGM;)
 }