aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImage.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-03-09 14:47:34 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-09 14:47:34 -0800
commit5671c5b9124f17d33bc14b6d347cdc6fe5d19dc8 (patch)
tree534c601a0a5f7d45cfc69d65485dc086f621cd24 /src/image/SkImage.cpp
parent6ceeebd37a43d879c120b6ba100ae1febdd67a18 (diff)
SkImage now has makeShader to return sk_sp
Diffstat (limited to 'src/image/SkImage.cpp')
-rw-r--r--src/image/SkImage.cpp12
1 files changed, 9 insertions, 3 deletions
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<SkShader> 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;