partial switch over to sp usage of shaders

gm/giantbitmap.cpp

 /*
  * Copyright 2011 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 "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 86 matching lines @@
 
         SkMatrix m;
         if (fDoRotate) {
 //            m.setRotate(SkIntToScalar(30), 0, 0);
             m.setSkew(SK_Scalar1, 0, 0, 0);
 //            m.postScale(2*SK_Scalar1/3, 2*SK_Scalar1/3);
         } else {
             SkScalar scale = 11*SK_Scalar1/12;
             m.setScale(scale, scale);
         }
-        SkShader* s = SkShader::CreateBitmapShader(getBitmap(), fMode, fMode, &m);
-
-        paint.setShader(s)->unref();
+        paint.setShader(SkShader::MakeBitmapShader(getBitmap(), fMode, fMode, &m));
         paint.setFilterQuality(fDoFilter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
 
         canvas->translate(SkIntToScalar(50), SkIntToScalar(50));
 
 //        SkRect r = SkRect::MakeXYWH(-50, -50, 32, 16);
 //        canvas->drawRect(r, paint); return;
         canvas->drawPaint(paint);
     }
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new GiantBitmapGM(SkShader::kClamp_TileMode, false, false); )
 DEF_GM( return new GiantBitmapGM(SkShader::kRepeat_TileMode, false, false); )
 DEF_GM( return new GiantBitmapGM(SkShader::kMirror_TileMode, false, false); )
 DEF_GM( return new GiantBitmapGM(SkShader::kClamp_TileMode, true, false); )
 DEF_GM( return new GiantBitmapGM(SkShader::kRepeat_TileMode, true, false); )
 DEF_GM( return new GiantBitmapGM(SkShader::kMirror_TileMode, true, false); )
 
 DEF_GM( return new GiantBitmapGM(SkShader::kClamp_TileMode, false, true); )
 DEF_GM( return new GiantBitmapGM(SkShader::kRepeat_TileMode, false, true); )
 DEF_GM( return new GiantBitmapGM(SkShader::kMirror_TileMode, false, true); )
 DEF_GM( return new GiantBitmapGM(SkShader::kClamp_TileMode, true, true); )
 DEF_GM( return new GiantBitmapGM(SkShader::kRepeat_TileMode, true, true); )
 DEF_GM( return new GiantBitmapGM(SkShader::kMirror_TileMode, true, true); )