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

gm/textblobshader.cpp

 /*
  * Copyright 2014 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"
@@ skipping 50 matching lines @@
         SkColor  colors[2];
         colors[0] = SK_ColorRED;
         colors[1] = SK_ColorGREEN;
 
         SkScalar pos[SK_ARRAY_COUNT(colors)];
         for (unsigned i = 0; i < SK_ARRAY_COUNT(pos); ++i) {
             pos[i] = (float)i / (SK_ARRAY_COUNT(pos) - 1);
         }
 
         SkISize sz = this->onISize();
-        fShader.reset(SkGradientShader::CreateRadial(SkPoint::Make(SkIntToScalar(sz.width() / 2),
-                                                                   SkIntToScalar(sz.height() / 2)),
-                                                     sz.width() * .66f, colors, pos,
-                                                     SK_ARRAY_COUNT(colors),
-                                                     SkShader::kRepeat_TileMode));
+        fShader = SkGradientShader::MakeRadial(SkPoint::Make(SkIntToScalar(sz.width() / 2),
+                                               SkIntToScalar(sz.height() / 2)),
+                                               sz.width() * .66f, colors, pos,
+                                               SK_ARRAY_COUNT(colors),
+                                               SkShader::kRepeat_TileMode);
     }
 
     SkString onShortName() override {
         return SkString("textblobshader");
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
@@ skipping 11 matching lines @@
                                      SkIntToScalar(i * sz.width() / kXCount),
                                      SkIntToScalar(j * sz.height() / kYCount),
                                      p);
             }
         }
     }
 
 private:
     SkTDArray<uint16_t>            fGlyphs;
     SkAutoTUnref<const SkTextBlob> fBlob;
-    SkAutoTUnref<SkShader>         fShader;
+    sk_sp<SkShader>                fShader;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new TextBlobShaderGM("Blobber");)