diff options
author | reed <reed@google.com> | 2016-03-09 09:50:50 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 09:50:50 -0800 |
commit | 2ad1aa67c6894696cdd65ec56057f81031d1c24a (patch) | |
tree | 867b2bf372ee13336e3f0525a72d017025a97455 /gm/bleed.cpp | |
parent | 7f229ed827d1dc5897acfa87d84b642ce34b678f (diff) |
partial switch over to sp usage of shaders
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1776973003
Review URL: https://codereview.chromium.org/1776973003
Diffstat (limited to 'gm/bleed.cpp')
-rw-r--r-- | gm/bleed.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gm/bleed.cpp b/gm/bleed.cpp index 1a96fdbfec..5a04162938 100644 --- a/gm/bleed.cpp +++ b/gm/bleed.cpp @@ -277,13 +277,13 @@ static bool make_ringed_oversized_alpha_texture_bitmap(GrContext* ctx, TestPixel ctx, result, width, height, kAlpha_8_GrPixelConfig, kZero, kOne, k3Q, kHalf, k1Q); } -static SkShader* make_shader() { +static sk_sp<SkShader> make_shader() { static const SkPoint pts[] = { {0, 0}, {20, 20} }; static const SkColor colors[] = { SK_ColorGREEN, SK_ColorYELLOW }; - return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kMirror_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kMirror_TileMode); } -static SkShader* make_null_shader() { return nullptr; } +static sk_sp<SkShader> make_null_shader() { return nullptr; } enum BleedTest { kUseBitmap_BleedTest, @@ -300,7 +300,7 @@ enum BleedTest { const struct { const char* fName; bool (*fPixelMaker)(GrContext*, TestPixels* result, int width, int height); - SkShader* (*fShaderMaker)(); + sk_sp<SkShader> (*fShaderMaker)(); } gBleedRec[] = { { "bleed", make_ringed_color_bitmap, make_null_shader }, { "bleed_texture_bmp", make_ringed_oversized_color_texture_bitmap, make_null_shader }, @@ -468,7 +468,7 @@ protected: return; } - fShader.reset(gBleedRec[fBT].fShaderMaker()); + fShader = gBleedRec[fBT].fShaderMaker(); canvas->clear(SK_ColorGRAY); SkTDArray<SkMatrix> matrices; @@ -582,13 +582,13 @@ private: static const int kSmallTextureSize = 6; static const int kMaxTileSize = 32; - bool fCreatedPixels; - TestPixels fBigTestPixels; - TestPixels fSmallTestPixels; + bool fCreatedPixels; + TestPixels fBigTestPixels; + TestPixels fSmallTestPixels; - SkAutoTUnref<SkShader> fShader; + sk_sp<SkShader> fShader; - const BleedTest fBT; + const BleedTest fBT; typedef GM INHERITED; }; |