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

gm/xfermodes.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 "SkBitmap.h"
 #include "SkShader.h"
@@ skipping 243 matching lines @@
         return SkISize::Make(1990, 660);
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->translate(SkIntToScalar(10), SkIntToScalar(20));
 
         const SkScalar w = SkIntToScalar(W);
         const SkScalar h = SkIntToScalar(H);
         SkMatrix m;
         m.setScale(SkIntToScalar(6), SkIntToScalar(6));
-        SkShader* s = SkShader::CreateBitmapShader(fBG,
-                                                   SkShader::kRepeat_TileMode,
-                                                   SkShader::kRepeat_TileMode,
-                                                   &m);
+        auto s = SkShader::MakeBitmapShader(fBG, SkShader::kRepeat_TileMode,
+                                            SkShader::kRepeat_TileMode, &m);
 
         SkPaint labelP;
         labelP.setAntiAlias(true);
         sk_tool_utils::set_portable_typeface(&labelP);
         labelP.setTextAlign(SkPaint::kCenter_Align);
 
         const int W = 5;
 
         SkScalar x0 = 0;
         SkScalar y0 = 0;
@@ skipping 40 matching lines @@
             if (y < 320) {
                 if (x > x0) {
                     y += h + SkIntToScalar(30);
                 }
                 y0 = y;
             } else {
                 x0 += SkIntToScalar(400);
                 y0 = 0;
             }
         }
-        s->unref();
     }
 
 private:
     typedef GM INHERITED;
 };
 DEF_GM( return new XfermodesGM; )