| Index: src/core/SkShader.cpp
|
| diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
|
| index 75f527bff3f1d6f3db531c2dd941f4e9c8ff2a77..6bf6928588c2de522f7989d2166b8ab3fe6178fd 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_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(const SkPicture* src, TileMode tmx, TileMode tmy,
|
| + const SkMatrix* localMatrix, const SkRect* tile) {
|
| + return SkPictureShader::Make(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
|
|
|