Revert of Finish conversion to sk_sp<SkShader>

bench/PatchBench.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 "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPaint.h"
@@ skipping 51 matching lines @@
     }
 
     virtual void setTexCoords() {
         const SkPoint texCoords[SkPatchUtils::kNumCorners] = {
             {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f,1.0f}, {0.0f, 1.0f}
         };
         memcpy(fTexCoords, texCoords, SkPatchUtils::kNumCorners * sizeof(SkPoint));
     }
 
     // override this method to change the shader
-    virtual sk_sp<SkShader> createShader() {
+    virtual SkShader* createShader() {
         const SkColor colors[] = {
             SK_ColorRED, SK_ColorCYAN, SK_ColorGREEN, SK_ColorWHITE,
             SK_ColorMAGENTA, SK_ColorBLUE, SK_ColorYELLOW,
         };
         const SkPoint pts[] = { { 200.f / 4.f, 0.f }, { 3.f * 200.f / 4, 200.f } };
 
-        return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors),
-                                            SkShader::kMirror_TileMode);
+        return SkGradientShader::CreateLinear(pts, colors, nullptr,
+                                              SK_ARRAY_COUNT(colors),
+                                              SkShader::kMirror_TileMode);
     }
 
 protected:
     const char* onGetName() override {
         SkString vertexMode;
         switch (fVertexMode) {
             case kNone_VertexMode:
                 vertexMode.set("meshlines");
                 break;
             case kColors_VertexMode:
@@ skipping 16 matching lines @@
     }
 
     void onDelayedSetup() override {
         this->setCubics();
         this->setColors();
         this->setTexCoords();
         this->setupPaint(&fPaint);
         switch (fVertexMode) {
             case kTexCoords_VertexMode:
             case kBoth_VertexMode:
-                fPaint.setShader(this->createShader());
+                fPaint.setShader(this->createShader())->unref();
                 break;
             default:
                 fPaint.setShader(nullptr);
                 break;
         }
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         canvas->scale(fScale.x(), fScale.y());
         for (int i = 0; i < loops; i++) {
@@ skipping 187 matching lines @@
 DEF_BENCH( return new LoopPatchBench(SkVector::Make(1.0f, 1.0f),
                                         PatchBench::kBoth_VertexMode); )
 DEF_BENCH( return new LoopPatchBench(SkVector::Make(3.0f, 3.0f),
                                         PatchBench::kNone_VertexMode); )
 DEF_BENCH( return new LoopPatchBench(SkVector::Make(3.0f, 3.0f),
                                         PatchBench::kColors_VertexMode); )
 DEF_BENCH( return new LoopPatchBench(SkVector::Make(3.0f, 3.0f),
                                         PatchBench::kTexCoords_VertexMode); )
 DEF_BENCH( return new LoopPatchBench(SkVector::Make(3.0f, 3.0f),
                                         PatchBench::kBoth_VertexMode); )