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 /tests/SkColor4fTest.cpp | |
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 'tests/SkColor4fTest.cpp')
-rw-r--r-- | tests/SkColor4fTest.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/SkColor4fTest.cpp b/tests/SkColor4fTest.cpp index ec40000dbb..62eed211df 100644 --- a/tests/SkColor4fTest.cpp +++ b/tests/SkColor4fTest.cpp @@ -98,9 +98,9 @@ static SkColorFilter* make_compose_cf() { return SkColorFilter::CreateComposeFilter(cf0, cf1); } -static SkShader* make_color_sh() { return SkShader::CreateColorShader(0xFFBB8855); } +static sk_sp<SkShader> make_color_sh() { return SkShader::MakeColorShader(0xFFBB8855); } -static SkShader* make_image_sh() { +static sk_sp<SkShader> make_image_sh() { const SkImageInfo info = SkImageInfo::MakeN32Premul(2, 2); const SkPMColor pixels[] { SkPackARGB32(0xFF, 0xBB, 0x88, 0x55), @@ -109,10 +109,10 @@ static SkShader* make_image_sh() { SkPackARGB32(0xFF, 0xBB, 0x88, 0x55), }; SkAutoTUnref<SkImage> image(SkImage::NewRasterCopy(info, pixels, sizeof(SkPMColor) * 2)); - return image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); + return image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); } -static SkShader* make_grad_sh() { +static sk_sp<SkShader> make_grad_sh() { #if 0 const SkPoint pts[] {{ 0, 0 }, { 100, 100 }}; const SkColor colors[] { SK_ColorRED, SK_ColorBLUE }; @@ -123,10 +123,10 @@ static SkShader* make_grad_sh() { #endif } -static SkShader* make_cf_sh() { +static sk_sp<SkShader> make_cf_sh() { SkAutoTUnref<SkColorFilter> filter(make_mx_cf()); - SkAutoTUnref<SkShader> shader(make_color_sh()); - return shader->newWithColorFilter(filter); + sk_sp<SkShader> shader(make_color_sh()); + return sk_sp<SkShader>(shader->newWithColorFilter(filter)); } static bool compare_spans(const SkPM4f span4f[], const SkPMColor span4b[], int count, @@ -143,9 +143,9 @@ static bool compare_spans(const SkPM4f span4f[], const SkPMColor span4b[], int c DEF_TEST(Color4f_shader, reporter) { struct { - SkShader* (*fFact)(); - bool fSupports4f; - float fTolerance; + sk_sp<SkShader> (*fFact)(); + bool fSupports4f; + float fTolerance; } recs[] = { { make_color_sh, true, 1.0f/255 }, // PMColor 4f gradients are interpolated in 255-multiplied values, so we need a @@ -158,7 +158,7 @@ DEF_TEST(Color4f_shader, reporter) { SkPaint paint; for (const auto& rec : recs) { uint32_t storage[300]; - paint.setShader(rec.fFact())->unref(); + paint.setShader(rec.fFact()); // Encourage 4f context selection. At some point we may need // to instantiate two separate contexts for optimal 4b/4f selection. const SkShader::ContextRec contextRec(paint, SkMatrix::I(), nullptr, |