Revert of more shader-->sp conversions

gm/pictureimagegenerator.cpp

 /*
  * Copyright 2015 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 "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 50 matching lines @@
 
     SkRect underlineRect = SkRect::MakeLTRB(iBox.centerX() - iBox.width() * accentSize * 3,
                                             underlineY,
                                             iBox.centerX(),
                                             underlineY + accentSize / 10);
     const SkPoint pts1[] = { SkPoint::Make(underlineRect.x(), 0),
                              SkPoint::Make(iBox.centerX(), 0) };
     const SkScalar pos1[] = { 0, 0.75f };
     const SkColor colors1[] = { SK_ColorTRANSPARENT, SK_ColorBLACK };
     SkASSERT(SK_ARRAY_COUNT(pos1) == SK_ARRAY_COUNT(colors1));
-    paint.setShader(SkGradientShader::MakeLinear(pts1, colors1, pos1, SK_ARRAY_COUNT(pos1),
-                                                 SkShader::kClamp_TileMode));
+    SkAutoTUnref<SkShader> gradient1(SkGradientShader::CreateLinear(pts1, colors1, pos1,
+                                                                    SK_ARRAY_COUNT(pos1),
+                                                                    SkShader::kClamp_TileMode));
+    paint.setShader(gradient1.get());
     canvas->drawRect(underlineRect, paint);
 
     const SkPoint pts2[] = { SkPoint::Make(iBox.x() - iBox.width() * kGradientPad, 0),
                              SkPoint::Make(iBox.right() + iBox.width() * kGradientPad, 0) };
     const SkScalar pos2[] = { 0, .01f, 1.0f/3, 1.0f/3, 2.0f/3, 2.0f/3, .99f, 1 };
     const SkColor colors2[] = {
         SK_ColorBLACK,
         0xffca5139,
         0xffca5139,
         0xff8dbd53,
         0xff8dbd53,
         0xff5460a5,
         0xff5460a5,
         SK_ColorBLACK
     };
     SkASSERT(SK_ARRAY_COUNT(pos2) == SK_ARRAY_COUNT(colors2));
-    paint.setShader(SkGradientShader::MakeLinear(pts2, colors2, pos2, SK_ARRAY_COUNT(pos2),
-                                                 SkShader::kClamp_TileMode));
+    SkAutoTUnref<SkShader> gradient2(SkGradientShader::CreateLinear(pts2, colors2, pos2,
+                                                                    SK_ARRAY_COUNT(pos2),
+                                                                    SkShader::kClamp_TileMode));
+    paint.setShader(gradient2.get());
     canvas->drawText(kSkiaStr, textLen, 0, 0, paint);
 }
 
 // This GM exercises SkPictureImageGenerator features
 // (in particular its matrix vs. bounds semantics).
 class PictureGeneratorGM : public skiagm::GM {
 protected:
     SkString onShortName() override {
         return SkString("pictureimagegenerator");
     }
@@ skipping 72 matching lines @@
 private:
     SkAutoTUnref<SkPicture> fPicture;
 
     const SkScalar kPictureWidth = 200;
     const SkScalar kPictureHeight = 100;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new PictureGeneratorGM;)