diff options
| author |  reed <reed@google.com> | 2016-03-09 14:47:34 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 14:47:34 -0800 |
| commit | 5671c5b9124f17d33bc14b6d347cdc6fe5d19dc8 (patch) | |
| tree | 534c601a0a5f7d45cfc69d65485dc086f621cd24 /gm | |
| parent | 6ceeebd37a43d879c120b6ba100ae1febdd67a18 (diff) | |
SkImage now has makeShader to return sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1785473002
Review URL: https://codereview.chromium.org/1785473002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/SkLinearBitmapPipelineGM.cpp | 3 | ||||
| -rw-r--r-- | gm/colorfilterimagefilter.cpp | 3 | ||||
| -rw-r--r-- | gm/image_shader.cpp | 3 | ||||
| -rw-r--r-- | gm/rectangletexture.cpp | 8 |
4 files changed, 7 insertions, 10 deletions
diff --git a/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp index d3a143c5c1..e93d2ac4c3 100644 --- a/gm/SkLinearBitmapPipelineGM.cpp +++ b/gm/SkLinearBitmapPipelineGM.cpp @@ -61,13 +61,12 @@ static void draw_rect_orig(SkCanvas* canvas, const SkRect& r, SkColor c, const S info, pmsrc.addr32(), pmsrc.rowBytes())}; SkPaint paint; int32_t storage[300]; - SkShader* shader = image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); + paint.setShader(image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)); if (useBilerp) { paint.setFilterQuality(SkFilterQuality::kLow_SkFilterQuality); } else { paint.setFilterQuality(SkFilterQuality::kNone_SkFilterQuality); } - paint.setShader(shader)->unref(); const SkShader::ContextRec rec(paint, *mat, nullptr, SkBlitter::PreferredShaderDest(pmsrc.info())); SkASSERT(paint.getShader()->contextSize(rec) <= sizeof(storage)); diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp index 4ab91f1afb..b0f67bff30 100644 --- a/gm/colorfilterimagefilter.cpp +++ b/gm/colorfilterimagefilter.cpp @@ -70,8 +70,7 @@ static sk_sp<SkShader> sh_make_image() { if (!image) { return nullptr; } - return sk_sp<SkShader>(image->newShader(SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode)); + return image->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); } static void sk_gm_get_shaders(SkTDArray<SkShader*>* array) { diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp index 084bb95a1a..7ea0202296 100644 --- a/gm/image_shader.cpp +++ b/gm/image_shader.cpp @@ -101,10 +101,9 @@ protected: const SkShader::TileMode tile = SkShader::kRepeat_TileMode; const SkMatrix localM = SkMatrix::MakeTrans(-50, -50); - SkAutoTUnref<SkShader> shader(image->newShader(tile, tile, &localM)); SkPaint paint; + paint.setShader(image->makeShader(tile, tile, &localM)); paint.setAntiAlias(true); - paint.setShader(shader); canvas->drawCircle(50, 50, 50, paint); } diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp index 0889063a1f..20f2ead593 100644 --- a/gm/rectangletexture.cpp +++ b/gm/rectangletexture.cpp @@ -164,15 +164,15 @@ protected: SkPaint clampPaint; clampPaint.setFilterQuality(q); - clampPaint.setShader(rectImg->newShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode))->unref(); + clampPaint.setShader(rectImg->makeShader(SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode)); canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), clampPaint); canvas->translate(kWidth * 1.5f + kPad, 0); SkPaint repeatPaint; repeatPaint.setFilterQuality(q); - repeatPaint.setShader(rectImg->newShader(SkShader::kRepeat_TileMode, - SkShader::kMirror_TileMode))->unref(); + repeatPaint.setShader(rectImg->makeShader(SkShader::kRepeat_TileMode, + SkShader::kMirror_TileMode)); canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), repeatPaint); canvas->translate(1.5f * kWidth + kPad, 0); } |