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

gm/samplerstress.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 "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkShader.h"
 
 namespace skiagm {
 
 /**
  * Stress test the GPU samplers by rendering a textured glyph with a mask and
  * an AA clip
  */
 class SamplerStressGM : public GM {
 public:
     SamplerStressGM()
     : fTextureCreated(false)
-    , fShader(nullptr)
     , fMaskFilter(nullptr) {
     }
 
-    virtual ~SamplerStressGM() {
-    }
-
 protected:
 
     SkString onShortName() override {
         return SkString("gpusamplerstress");
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
@@ skipping 21 matching lines @@
                 if ((x % 7) == 0) {
                     addr[y*xSize+x] = SkPreMultiplyColor(SK_ColorGREEN);
                 }
             }
         }
 
         fTextureCreated = true;
     }
 
     void createShader() {
-        if (fShader.get()) {
+        if (fShader) {
             return;
         }
 
         createTexture();
 
-        fShader.reset(SkShader::CreateBitmapShader(fTexture,
-                                                   SkShader::kRepeat_TileMode,
-                                                   SkShader::kRepeat_TileMode));
+        fShader = SkShader::MakeBitmapShader(fTexture, SkShader::kRepeat_TileMode,
+                                             SkShader::kRepeat_TileMode);
     }
 
     void createMaskFilter() {
         if (fMaskFilter.get()) {
             return;
         }
 
         const SkScalar sigma = 1;
         fMaskFilter.reset(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, sigma));
     }
@@ skipping 42 matching lines @@
         canvas->drawText("M", 1,
                          SkIntToScalar(100), SkIntToScalar(100),
                          paint2);
 
         paint2.setColor(sk_tool_utils::color_to_565(SK_ColorGRAY));
 
         canvas->drawPath(path, paint2);
     }
 
 private:
-    SkBitmap      fTexture;
-    bool          fTextureCreated;
-    SkAutoTUnref<SkShader>     fShader;
+    SkBitmap        fTexture;
+    bool            fTextureCreated;
+    sk_sp<SkShader> fShader;
     SkAutoTUnref<SkMaskFilter> fMaskFilter;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new SamplerStressGM; }
 static GMRegistry reg(MyFactory);
 
 }