Swap SkPictureImageFilter's factories over to smart pointers

src/effects/SkPictureImageFilter.cpp

 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureImageFilter.h"
 #include "SkDevice.h"
 #include "SkCanvas.h"
 #include "SkReadBuffer.h"
 #include "SkSurfaceProps.h"
 #include "SkWriteBuffer.h"
 #include "SkValidationUtils.h"
 
-SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture)
+SkPictureImageFilter::SkPictureImageFilter(sk_sp<SkPicture> picture)
     : INHERITED(0, 0, nullptr)
-    , fPicture(SkSafeRef(picture))
+    , fPicture(std::move(picture))
     , fCropRect(picture ? picture->cullRect() : SkRect::MakeEmpty())
     , fPictureResolution(kDeviceSpace_PictureResolution) 
     , fFilterQuality(kLow_SkFilterQuality) {
 }
 
-SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
+SkPictureImageFilter::SkPictureImageFilter(sk_sp<SkPicture> picture, const SkRect& cropRect,
                                            PictureResolution pictureResolution,
                                            SkFilterQuality filterQuality)
     : INHERITED(0, 0, nullptr)
-    , fPicture(SkSafeRef(picture))
+    , fPicture(std::move(picture))
     , fCropRect(cropRect)
     , fPictureResolution(pictureResolution)
     , fFilterQuality(filterQuality) {
 }
 
-SkPictureImageFilter::~SkPictureImageFilter() {
-    SkSafeUnref(fPicture);
-}
-
 SkFlattenable* SkPictureImageFilter::CreateProc(SkReadBuffer& buffer) {
     sk_sp<SkPicture> picture;
     SkRect cropRect;
 
     if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
         buffer.validate(!buffer.readBool());
     } else {
         if (buffer.readBool()) {
             picture = SkPicture::MakeFromBuffer(buffer);
         }
     }
     buffer.readRect(&cropRect);
     PictureResolution pictureResolution;
     if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterResolution_Version)) {
         pictureResolution = kDeviceSpace_PictureResolution;
     } else {
         pictureResolution = (PictureResolution)buffer.readInt();
     }  
 
     if (kLocalSpace_PictureResolution == pictureResolution) {
         //filterLevel is only serialized if pictureResolution is LocalSpace
         SkFilterQuality filterQuality;
         if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterLevel_Version)) {
             filterQuality = kLow_SkFilterQuality;
         } else {
             filterQuality = (SkFilterQuality)buffer.readInt();
         }
-        return CreateForLocalSpace(picture.get(), cropRect, filterQuality);
+        return MakeForLocalSpace(picture, cropRect, filterQuality).release();
     }
-    return Create(picture.get(), cropRect);
+    return Make(picture, cropRect).release();
 }
 
 void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
     if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
         buffer.writeBool(false);
     } else {
         bool hasPicture = (fPicture != nullptr);
         buffer.writeBool(hasPicture);
         if (hasPicture) {
             fPicture->flatten(buffer);
@@ skipping 90 matching lines @@
     str->appendf("crop: (%f,%f,%f,%f) ", 
                  fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fBottom);
     if (fPicture) {
         str->appendf("picture: (%f,%f,%f,%f)",
                      fPicture->cullRect().fLeft, fPicture->cullRect().fTop,
                      fPicture->cullRect().fRight, fPicture->cullRect().fBottom);
     }
     str->append(")");
 }
 #endif