| commit | 7fb4f8bd031eda87e1da9bc0f749968c0e872e6f | [log] [tgz] |
|---|---|---|
| author | reed <reed@google.com> | Fri Mar 11 04:33:52 2016 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Mar 11 04:33:52 2016 -0800 |
| tree | 51ce5e58b62e0e3b57065e12517670d77c17837e | |
| parent | db6bd3239fd5e35797a9aa36eb0044ecbe5557c4 [diff] [blame] |
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
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 0bcb98a..158d526 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h
@@ -411,7 +411,7 @@ * bounds. * @return Returns a new shader object. Note: this function never returns null. */ - static sk_sp<SkShader> MakePictureShader(sk_sp<const SkPicture> src, TileMode tmx, TileMode tmy, + static sk_sp<SkShader> MakePictureShader(sk_sp<SkPicture> src, TileMode tmx, TileMode tmy, const SkMatrix* localMatrix, const SkRect* tile); /**