commit 549c8991959333e5c0f53faebcbbd5d6bc8f6a56
author robertphillips <robertphillips@google.com> Fri Apr 01 09:28:51 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 01 09:28:51 2016 -0700
tree db498c61ef16f570f8c43b5c7bf462529134704a
parent f27002947d40ab884e13d39ee2ef0ac4ccadcd6a

Update SkImageSource to sk_sp

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842243002

Review URL: https://codereview.chromium.org/1842243002

src/effects/SkImageSource.cpp

diff --git a/src/effects/SkImageSource.cpp b/src/effects/SkImageSource.cpp
index f095df6..f16e5a1 100644
--- a/src/effects/SkImageSource.cpp
+++ b/src/effects/SkImageSource.cpp
@@ -15,33 +15,25 @@
 #include "SkWriteBuffer.h"
 #include "SkString.h"
 
-SkImageFilter* SkImageSource::Create(SkImage* image) {
-    return image ? new SkImageSource(image) : nullptr;
-}
 
-SkImageFilter* SkImageSource::Create(SkImage* image,
-                                     const SkRect& srcRect,
-                                     const SkRect& dstRect,
-                                     SkFilterQuality filterQuality) {
-    return image ? new SkImageSource(image, srcRect, dstRect, filterQuality) : nullptr;
-}
-
-SkImageSource::SkImageSource(SkImage* image)
+SkImageSource::SkImageSource(sk_sp<SkImage> image)
     : INHERITED(0, nullptr)
-    , fImage(SkRef(image))
-    , fSrcRect(SkRect::MakeIWH(image->width(), image->height()))
+    , fImage(std::move(image))
+    , fSrcRect(SkRect::MakeIWH(fImage->width(), fImage->height()))
     , fDstRect(fSrcRect)
-    , fFilterQuality(kHigh_SkFilterQuality) { }
+    , fFilterQuality(kHigh_SkFilterQuality) {
+}
 
-SkImageSource::SkImageSource(SkImage* image,
+SkImageSource::SkImageSource(sk_sp<SkImage> image,
                              const SkRect& srcRect,
                              const SkRect& dstRect,
                              SkFilterQuality filterQuality)
     : INHERITED(0, nullptr)
-    , fImage(SkRef(image))
+    , fImage(std::move(image))
     , fSrcRect(srcRect)
     , fDstRect(dstRect)
-    , fFilterQuality(filterQuality) { }
+    , fFilterQuality(filterQuality) {
+}
 
 SkFlattenable* SkImageSource::CreateProc(SkReadBuffer& buffer) {
     SkFilterQuality filterQuality = (SkFilterQuality)buffer.readInt();
@@ -50,12 +42,12 @@
     buffer.readRect(&src);
     buffer.readRect(&dst);
 
-    SkAutoTUnref<SkImage> image(buffer.readImage());
+    sk_sp<SkImage> image(buffer.readImage());
     if (!image) {
         return nullptr;
     }
 
-    return SkImageSource::Create(image, src, dst, filterQuality);
+    return SkImageSource::Make(std::move(image), src, dst, filterQuality).release();
 }
 
 void SkImageSource::flatten(SkWriteBuffer& buffer) const {