| Index: include/gpu/GrXferProcessor.h
|
| diff --git a/include/gpu/GrXferProcessor.h b/include/gpu/GrXferProcessor.h
|
| index 1d4717e1569dd4f1799582242b859bf9d6e39fba..5317c187e2e0784093955365f9b67c83d0ee42ea 100644
|
| --- a/include/gpu/GrXferProcessor.h
|
| +++ b/include/gpu/GrXferProcessor.h
|
| @@ -70,7 +70,7 @@ public:
|
| }
|
|
|
| DstTexture& operator=(const DstTexture& other) {
|
| - fTexture.reset(SkSafeRef(other.fTexture.get()));
|
| + fTexture = other.fTexture;
|
| fOffset = other.fOffset;
|
| return *this;
|
| }
|
| @@ -82,14 +82,13 @@ public:
|
|
|
| GrTexture* texture() const { return fTexture.get(); }
|
|
|
| - GrTexture* setTexture(GrTexture* texture) {
|
| - fTexture.reset(SkSafeRef(texture));
|
| - return texture;
|
| + void setTexture(sk_sp<GrTexture> texture) {
|
| + fTexture = std::move(texture);
|
| }
|
|
|
| private:
|
| - SkAutoTUnref<GrTexture> fTexture;
|
| - SkIPoint fOffset;
|
| + sk_sp<GrTexture> fTexture;
|
| + SkIPoint fOffset;
|
| };
|
|
|
| /**
|
|
|