diff options
author | 2016-03-08 18:50:00 -0800 | |
---|---|---|
committer | 2016-03-08 18:50:00 -0800 | |
commit | 8a21c9fe7f5fef9e87115defef27bd7218419f28 (patch) | |
tree | 1dd8b9eda9eae99b33bc88b97bd5f0a7a0769dc3 /src/core/SkShader.cpp | |
parent | 042f859c19f71ca9feacddd1cb058ff59eed8963 (diff) |
use Make instead of Create to return a shared shader
Partially updated call sites. Undefine the flag in SkSHader.h to convert the remaining sites.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1772463002
Review URL: https://codereview.chromium.org/1772463002
Diffstat (limited to 'src/core/SkShader.cpp')
-rw-r--r-- | src/core/SkShader.cpp | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 75f527bff3..7b322fb627 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -229,18 +229,18 @@ SkShader* SkShader::refAsALocalMatrixShader(SkMatrix*) const { return nullptr; } -SkShader* SkShader::CreateEmptyShader() { return new SkEmptyShader; } +sk_sp<SkShader> SkShader::MakeEmptyShader() { return sk_make_sp<SkEmptyShader>(); } -SkShader* SkShader::CreateColorShader(SkColor color) { return new SkColorShader(color); } +sk_sp<SkShader> SkShader::MakeColorShader(SkColor color) { return sk_make_sp<SkColorShader>(color); } -SkShader* SkShader::CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy, - const SkMatrix* localMatrix) { - return SkCreateBitmapShader(src, tmx, tmy, localMatrix, nullptr); +sk_sp<SkShader> SkShader::MakeBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy, + const SkMatrix* localMatrix) { + return SkMakeBitmapShader(src, tmx, tmy, localMatrix, nullptr); } -SkShader* SkShader::CreatePictureShader(const SkPicture* src, TileMode tmx, TileMode tmy, - const SkMatrix* localMatrix, const SkRect* tile) { - return SkPictureShader::Create(src, tmx, tmy, localMatrix, tile); +sk_sp<SkShader> SkShader::MakePictureShader(sk_sp<const SkPicture> src, TileMode tmx, TileMode tmy, + const SkMatrix* localMatrix, const SkRect* tile) { + return SkPictureShader::Make(std::move(src), tmx, tmy, localMatrix, tile); } #ifndef SK_IGNORE_TO_STRING @@ -362,7 +362,7 @@ void SkColorShader::toString(SkString* str) const { /////////////////////////////////////////////////////////////////////////////// SkFlattenable* SkEmptyShader::CreateProc(SkReadBuffer&) { - return SkShader::CreateEmptyShader(); + return SkShader::MakeEmptyShader().release(); } #ifndef SK_IGNORE_TO_STRING @@ -376,3 +376,18 @@ void SkEmptyShader::toString(SkString* str) const { str->append(")"); } #endif + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR +SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode::Mode mode) { + return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), mode).release(); +} +SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode* xfer) { + return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), xfer).release(); +} +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(); +} +#endif |