Chromium Code Reviews| Index: src/effects/SkImageSource.cpp |
| diff --git a/src/effects/SkImageSource.cpp b/src/effects/SkImageSource.cpp |
| index f095df69a8e5458c45187c13b8da8ab59e515e87..1e5e8dce33361a3ef704bd81529f48675277b0fa 100644 |
| --- a/src/effects/SkImageSource.cpp |
| +++ b/src/effects/SkImageSource.cpp |
| @@ -15,30 +15,20 @@ |
| #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)) |
| + , fImage(image) |
|
f(malita)
2016/03/31 13:09:15
move image?
robertphillips
2016/03/31 14:35:09
Done.
|
| , fSrcRect(SkRect::MakeIWH(image->width(), image->height())) |
| , fDstRect(fSrcRect) |
| , 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(image) |
|
f(malita)
2016/03/31 13:09:15
move image?
robertphillips
2016/03/31 14:35:09
Done.
|
| , fSrcRect(srcRect) |
| , fDstRect(dstRect) |
| , fFilterQuality(filterQuality) { } |
| @@ -50,12 +40,12 @@ SkFlattenable* SkImageSource::CreateProc(SkReadBuffer& buffer) { |
| 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 { |