diff options
| author |  reed <reed@google.com> | 2016-03-08 18:50:00 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-08 18:50:00 -0800 |
| commit | 8a21c9fe7f5fef9e87115defef27bd7218419f28 (patch) | |
| tree | 1dd8b9eda9eae99b33bc88b97bd5f0a7a0769dc3 /samplecode/SampleAARectModes.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 'samplecode/SampleAARectModes.cpp')
| -rw-r--r-- | samplecode/SampleAARectModes.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp index ae28925a42..43392235c9 100644 --- a/samplecode/SampleAARectModes.cpp +++ b/samplecode/SampleAARectModes.cpp @@ -61,7 +61,7 @@ static SkScalar drawCell(SkCanvas* canvas, SkXfermode* mode, return H; } -static SkShader* make_bg_shader() { +static sk_sp<SkShader> make_bg_shader() { SkBitmap bm; bm.allocN32Pixels(2, 2); *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF; @@ -71,17 +71,17 @@ static SkShader* make_bg_shader() { SkMatrix m; m.setScale(SkIntToScalar(6), SkIntToScalar(6)); - return SkShader::CreateBitmapShader(bm, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, - &m); + return SkShader::MakeBitmapShader(bm, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &m); } class AARectsModesView : public SampleView { SkPaint fBGPaint; public: AARectsModesView () { - fBGPaint.setShader(make_bg_shader())->unref(); + fBGPaint.setShader(make_bg_shader()); } protected: |