update callsites for Make image factories

gm/xfermodeimagefilter.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 "sk_tool_utils.h"
 #include "SkArithmeticMode.h"
@@ skipping 19 matching lines @@
         return SkString("xfermodeimagefilter");
     }
 
     SkISize onISize() override {
         return SkISize::Make(WIDTH, HEIGHT);
     }
 
     void onOnceBeforeDraw() override {
         fBitmap = sk_tool_utils::create_string_bitmap(80, 80, 0xD000D000, 15, 65, 96, "e");
 
-        fCheckerboard.reset(SkImage::NewFromBitmap(
+        fCheckerboard = SkImage::MakeFromBitmap(
             sk_tool_utils::create_checkerboard_bitmap(80, 80,
                                                       sk_tool_utils::color_to_565(0xFFA0A0A0),
                                                       sk_tool_utils::color_to_565(0xFF404040),
-                                                      8)));
+                                                      8));
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->clear(SK_ColorBLACK);
         SkPaint paint;
 
         const struct {
             SkXfermode::Mode  fMode;
             const char*         fLabel;
         } gModes[] = {
@@ skipping 23 matching lines @@
             { SkXfermode::kDifference_Mode,   "Difference"    },
             { SkXfermode::kExclusion_Mode,    "Exclusion"     },
             { SkXfermode::kMultiply_Mode,     "Multiply"      },
             { SkXfermode::kHue_Mode,          "Hue"           },
             { SkXfermode::kSaturation_Mode,   "Saturation"    },
             { SkXfermode::kColor_Mode,        "Color"         },
             { SkXfermode::kLuminosity_Mode,   "Luminosity"    },
         };
 
         int x = 0, y = 0;
-        SkAutoTUnref<SkImageFilter> background(SkImageSource::Create(fCheckerboard));
+        SkAutoTUnref<SkImageFilter> background(SkImageSource::Create(fCheckerboard.get()));
         for (size_t i = 0; i < SK_ARRAY_COUNT(gModes); i++) {
             SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(gModes[i].fMode));
             SkAutoTUnref<SkImageFilter> filter(SkXfermodeImageFilter::Create(mode, background));
             paint.setImageFilter(filter);
             DrawClippedBitmap(canvas, fBitmap, paint, x, y);
             x += fBitmap.width() + MARGIN;
             if (x + fBitmap.width() > WIDTH) {
                 x = 0;
                 y += fBitmap.height() + MARGIN;
             }
@@ skipping 13 matching lines @@
         paint.setImageFilter(filter);
         DrawClippedBitmap(canvas, fBitmap, paint, x, y);
         x += fBitmap.width() + MARGIN;
         if (x + fBitmap.width() > WIDTH) {
             x = 0;
             y += fBitmap.height() + MARGIN;
         }
         SkRect clipRect = SkRect::MakeWH(SkIntToScalar(fBitmap.width() + 4),
                                          SkIntToScalar(fBitmap.height() + 4));
         // Test offsets on SrcMode (uses fixed-function blend)
-        SkAutoTUnref<SkImage> bitmapImage(SkImage::NewFromBitmap(fBitmap));
-        SkAutoTUnref<SkImageFilter> foreground(SkImageSource::Create(bitmapImage));
+        sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(fBitmap));
+        SkAutoTUnref<SkImageFilter> foreground(SkImageSource::Create(bitmapImage.get()));
         SkAutoTUnref<SkImageFilter> offsetForeground(SkOffsetImageFilter::Create(
             SkIntToScalar(4), SkIntToScalar(-4), foreground));
         SkAutoTUnref<SkImageFilter> offsetBackground(SkOffsetImageFilter::Create(
             SkIntToScalar(4), SkIntToScalar(4), background));
         mode.reset(SkXfermode::Create(SkXfermode::kSrcOver_Mode));
         filter.reset(SkXfermodeImageFilter::Create(mode, offsetBackground, offsetForeground));
         paint.setImageFilter(filter);
         DrawClippedPaint(canvas, clipRect, paint, x, y);
         x += fBitmap.width() + MARGIN;
         if (x + fBitmap.width() > WIDTH) {
@@ skipping 72 matching lines @@
 
     static void DrawClippedPaint(SkCanvas* canvas, const SkRect& rect, const SkPaint& paint,
                           int x, int y) {
         canvas->save();
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(rect);
         canvas->drawPaint(paint);
         canvas->restore();
     }
 
-    SkBitmap              fBitmap;
-    SkAutoTUnref<SkImage> fCheckerboard;
+    SkBitmap        fBitmap;
+    sk_sp<SkImage>  fCheckerboard;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new XfermodeImageFilterGM; );
 
 }