Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )

Reason for revert:
seems to have changed pictureshadertile

Original issue's description:
> more shader-->sp conversions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002
>
> Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c

TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1790353002

1 files changed, 11 insertions, 6 deletions

diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp
index f317cf9103..4bec6784a8 100644
--- a/gm/samplerstress.cpp
+++ b/gm/samplerstress.cpp
@@ -21,9 +21,13 @@ class SamplerStressGM : public GM {
 public:
     SamplerStressGM()
     : fTextureCreated(false)
+    , fShader(nullptr)
     , fMaskFilter(nullptr) {
     }
 
+    virtual ~SamplerStressGM() {
+    }
+
 protected:
 
     SkString onShortName() override {
@@ -65,14 +69,15 @@ protected:
     }
 
     void createShader() {
-        if (fShader) {
+        if (fShader.get()) {
             return;
         }
 
         createTexture();
 
-        fShader = SkShader::MakeBitmapShader(fTexture, SkShader::kRepeat_TileMode,
-                                             SkShader::kRepeat_TileMode);
+        fShader.reset(SkShader::CreateBitmapShader(fTexture,
+                                                   SkShader::kRepeat_TileMode,
+                                                   SkShader::kRepeat_TileMode));
     }
 
     void createMaskFilter() {
@@ -135,9 +140,9 @@ protected:
     }
 
 private:
-    SkBitmap        fTexture;
-    bool            fTextureCreated;
-    sk_sp<SkShader> fShader;
+    SkBitmap      fTexture;
+    bool          fTextureCreated;
+    SkAutoTUnref<SkShader>     fShader;
     SkAutoTUnref<SkMaskFilter> fMaskFilter;
 
     typedef GM INHERITED;