Revert of more shader-->sp conversions

gm/xfermodes2.cpp

 
 /*
  * Copyright 2013 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 "SkShader.h"
@@ skipping 81 matching lines @@
             SkPackARGB32(0xFF, 0xD6, 0xD3, 0xD6),
             SkPackARGB32(0xFF, 0xD6, 0xD3, 0xD6),
             SkPackARGB32(0xFF, 0x42, 0x41, 0x42)
         };
         SkBitmap bg;
         bg.allocN32Pixels(2, 2, true);
         memcpy(bg.getPixels(), kCheckData, sizeof(kCheckData));
 
         SkMatrix lm;
         lm.setScale(SkIntToScalar(16), SkIntToScalar(16));
-        fBG = SkShader::MakeBitmapShader(bg, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
-                                         &lm);
+        fBG.reset(SkShader::CreateBitmapShader(bg,
+                                               SkShader::kRepeat_TileMode,
+                                               SkShader::kRepeat_TileMode,
+                                               &lm));
 
         SkBitmap srcBmp;
         srcBmp.allocN32Pixels(kSize, kSize);
         SkPMColor* pixels = reinterpret_cast<SkPMColor*>(srcBmp.getPixels());
 
         for (int y = 0; y < kSize; ++y) {
             int c = y * (1 << kShift);
             SkPMColor rowColor = SkPackARGB32(c, c, 0, c/2);
             for (int x = 0; x < kSize; ++x) {
                 pixels[kSize * y + x] = rowColor;
             }
         }
-        fSrc = SkShader::MakeBitmapShader(srcBmp, SkShader::kClamp_TileMode,
-                                          SkShader::kClamp_TileMode);
+        fSrc.reset(SkShader::CreateBitmapShader(srcBmp,
+                                                SkShader::kClamp_TileMode,
+                                                SkShader::kClamp_TileMode));
         SkBitmap dstBmp;
         dstBmp.allocN32Pixels(kSize, kSize);
         pixels = reinterpret_cast<SkPMColor*>(dstBmp.getPixels());
 
         for (int x = 0; x < kSize; ++x) {
             int c = x * (1 << kShift);
             SkPMColor colColor = SkPackARGB32(c, 0, c, c/2);
             for (int y = 0; y < kSize; ++y) {
                 pixels[kSize * y + x] = colColor;
             }
         }
-        fDst = SkShader::MakeBitmapShader(dstBmp, SkShader::kClamp_TileMode,
-                                          SkShader::kClamp_TileMode);
+        fDst.reset(SkShader::CreateBitmapShader(dstBmp,
+                                                SkShader::kClamp_TileMode,
+                                                SkShader::kClamp_TileMode));
     }
 
     enum {
         kShift = 2,
         kSize = 256 >> kShift,
     };
 
-    sk_sp<SkShader> fBG;
-    sk_sp<SkShader> fSrc;
-    sk_sp<SkShader> fDst;
+    SkAutoTUnref<SkShader> fBG;
+    SkAutoTUnref<SkShader> fSrc;
+    SkAutoTUnref<SkShader> fDst;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new Xfermodes2GM; }
 static GMRegistry reg(MyFactory);
 
 }