diff options
| author |  reed <reed@google.com> | 2016-03-11 04:33:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-11 04:33:52 -0800 |
| commit | 7fb4f8bd031eda87e1da9bc0f749968c0e872e6f (patch) | |
| tree | 51ce5e58b62e0e3b57065e12517670d77c17837e /src/core/SkShader.cpp | |
| parent | db6bd3239fd5e35797a9aa36eb0044ecbe5557c4 (diff) | |
Revert "Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1778393002/ )"
Fix was to call get() instead of release() when passing the sp to a bare-ptr method.
This reverts commit e683c56115a210b5993df9294260bb147b408bfa.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789443002
TBR=
Review URL: https://codereview.chromium.org/1789443002
Diffstat (limited to 'src/core/SkShader.cpp')
| -rw-r--r-- | src/core/SkShader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 7b322fb627..1413a6ee73 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -238,7 +238,7 @@ sk_sp<SkShader> SkShader::MakeBitmapShader(const SkBitmap& src, TileMode tmx, Ti return SkMakeBitmapShader(src, tmx, tmy, localMatrix, nullptr); } -sk_sp<SkShader> SkShader::MakePictureShader(sk_sp<const SkPicture> src, TileMode tmx, TileMode tmy, +sk_sp<SkShader> SkShader::MakePictureShader(sk_sp<SkPicture> src, TileMode tmx, TileMode tmy, const SkMatrix* localMatrix, const SkRect* tile) { return SkPictureShader::Make(std::move(src), tmx, tmy, localMatrix, tile); } @@ -388,6 +388,7 @@ SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode } SkShader* SkShader::CreatePictureShader(const SkPicture* src, TileMode tmx, TileMode tmy, const SkMatrix* localMatrix, const SkRect* tile) { - return MakePictureShader(sk_ref_sp(src), tmx, tmy, localMatrix, tile).release(); + return MakePictureShader(sk_ref_sp(const_cast<SkPicture*>(src)), tmx, tmy, + localMatrix, tile).release(); } #endif |