Swap SkPictureImageFilter's factories over to smart pointers

tests/ImageFilterTest.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 "SkBitmap.h"
 #include "SkBitmapDevice.h"
@@ skipping 116 matching lines @@
         matrix.postRotate(SkIntToScalar(45), SK_Scalar1, SK_Scalar1);
 
         SkRTreeFactory factory;
         SkPictureRecorder recorder;
         SkCanvas* recordingCanvas = recorder.beginRecording(64, 64, &factory, 0);
 
         SkPaint greenPaint;
         greenPaint.setColor(SK_ColorGREEN);
         recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 30, 20)), greenPaint);
         sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
-        SkAutoTUnref<SkImageFilter> pictureFilter(SkPictureImageFilter::Create(picture.get()));
+        sk_sp<SkImageFilter> pictureFilter(SkPictureImageFilter::Make(picture));
         sk_sp<SkShader> shader(SkPerlinNoiseShader::MakeTurbulence(SK_Scalar1, SK_Scalar1, 1, 0));
 
         SkPaint paint;
         paint.setShader(shader);
         SkAutoTUnref<SkImageFilter> paintFilter(SkPaintImageFilter::Create(paint));
 
         sk_sp<SkShader> greenColorShader(SkShader::MakeColorShader(SK_ColorGREEN));
         SkPaint greenColorShaderPaint;
         greenColorShaderPaint.setShader(greenColorShader);
         SkImageFilter::CropRect leftSideCropRect(SkRect::MakeXYWH(0, 0, 32, 64));
@@ skipping 869 matching lines @@
     SkPictureRecorder recorder;
     SkCanvas* recordingCanvas = recorder.beginRecording(1, 1, &factory, 0);
 
     // Create an SkPicture which simply draws a green 1x1 rectangle.
     SkPaint greenPaint;
     greenPaint.setColor(SK_ColorGREEN);
     recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), greenPaint);
     sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
 
     // Wrap that SkPicture in an SkPictureImageFilter.
-    SkAutoTUnref<SkImageFilter> imageFilter(
-        SkPictureImageFilter::Create(picture.get()));
+    sk_sp<SkImageFilter> imageFilter(SkPictureImageFilter::Make(picture));
 
     // Check that SkPictureImageFilter successfully serializes its contained
     // SkPicture when not in cross-process mode.
     SkPaint paint;
-    paint.setImageFilter(imageFilter.get());
+    paint.setImageFilter(imageFilter);
     SkPictureRecorder outerRecorder;
     SkCanvas* outerCanvas = outerRecorder.beginRecording(1, 1, &factory, 0);
     SkPaint redPaintWithFilter;
     redPaintWithFilter.setColor(SK_ColorRED);
-    redPaintWithFilter.setImageFilter(imageFilter.get());
+    redPaintWithFilter.setImageFilter(imageFilter);
     outerCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), redPaintWithFilter);
     sk_sp<SkPicture> outerPicture(outerRecorder.finishRecordingAsPicture());
 
     SkBitmap bitmap;
     bitmap.allocN32Pixels(1, 1);
     SkCanvas canvas(bitmap);
 
     // The result here should be green, since the filter replaces the primitive's red interior.
     canvas.clear(0x0);
     canvas.drawPicture(outerPicture);
@@ skipping 35 matching lines @@
 
         // Create an SkPicture which simply draws a green 1x1 rectangle.
         SkPaint greenPaint;
         greenPaint.setColor(SK_ColorGREEN);
         recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), greenPaint);
         picture = recorder.finishRecordingAsPicture();
     }
 
     sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 2));
 
-    SkAutoTUnref<SkImageFilter> imageFilter(SkPictureImageFilter::Create(picture.get()));
+    sk_sp<SkImageFilter> imageFilter(SkPictureImageFilter::Make(picture));
 
     SkIPoint offset;
     SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(1, 1, 1, 1), nullptr);
 
     sk_sp<SkSpecialImage> resultImage(imageFilter->filterImage(srcImg.get(), ctx, &offset));
     REPORTER_ASSERT(reporter, !resultImage);
 }
 
 DEF_TEST(ImageFilterClippedPictureImageFilter, reporter) {
     run_raster_test(reporter, 2, test_clipped_picture_imagefilter);
@@ skipping 267 matching lines @@
     // filter, so that the inner filter produces the pixels that the outer
     // filter requires as input. This matters if the outer filter moves pixels.
     // Here, accounting for the outer offset is necessary so that the green
     // pixels of the picture are not clipped.
 
     SkPictureRecorder recorder;
     SkCanvas* recordingCanvas = recorder.beginRecording(SkRect::MakeWH(200, 100));
     recordingCanvas->clipRect(SkRect::MakeXYWH(100, 0, 100, 100));
     recordingCanvas->clear(SK_ColorGREEN);
     sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
-    sk_sp<SkImageFilter> pictureFilter(
-        SkPictureImageFilter::Create(picture.get()));
+    sk_sp<SkImageFilter> pictureFilter(SkPictureImageFilter::Make(picture));
     SkImageFilter::CropRect cropRect(SkRect::MakeWH(100, 100));
     sk_sp<SkImageFilter> offsetFilter(SkOffsetImageFilter::Create(-100, 0, nullptr, &cropRect));
     sk_sp<SkImageFilter> composedFilter(
         SkComposeImageFilter::Create(offsetFilter.get(), pictureFilter.get()));
 
     sk_sp<SkSpecialImage> sourceImage(create_empty_special_image(context, proxy, 100));
     SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
     SkIPoint offset;
     sk_sp<SkSpecialImage> result(composedFilter->filterImage(sourceImage.get(), ctx, &offset));
     REPORTER_ASSERT(reporter, offset.isZero());
@@ skipping 198 matching lines @@
 
     test_xfermode_cropped_input(&canvas, reporter);
 }
 
 DEF_GPUTEST_FOR_ALL_CONTEXTS(BlurLargeImage_Gpu, reporter, context) {
     auto surface(SkSurface::MakeRenderTarget(context, SkBudgeted::kYes,
                                              SkImageInfo::MakeN32Premul(100, 100)));
     test_large_blur_input(reporter, surface->getCanvas());
 }
 #endif