From 5671c5b9124f17d33bc14b6d347cdc6fe5d19dc8 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 9 Mar 2016 14:47:34 -0800 Subject: SkImage now has makeShader to return sk_sp BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1785473002 Review URL: https://codereview.chromium.org/1785473002 --- src/image/SkImage.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/image/SkImage.cpp') diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 5e7cb07226..a41ac83d19 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -103,11 +103,17 @@ void SkImage::preroll(GrContext* ctx) const { /////////////////////////////////////////////////////////////////////////////////////////////////// -SkShader* SkImage::newShader(SkShader::TileMode tileX, - SkShader::TileMode tileY, +sk_sp SkImage::makeShader(SkShader::TileMode tileX, SkShader::TileMode tileY, + const SkMatrix* localMatrix) const { + return SkImageShader::Make(this, tileX, tileY, localMatrix); +} + +#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR +SkShader* SkImage::newShader(SkShader::TileMode tileX, SkShader::TileMode tileY, const SkMatrix* localMatrix) const { - return SkImageShader::Create(this, tileX, tileY, localMatrix); + return this->makeShader(tileX, tileY, localMatrix).release(); } +#endif SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { SkBitmap bm; -- cgit v1.2.3