diff options
| author |  reed <reed@google.com> | 2016-03-25 09:08:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 09:08:00 -0700 |
| commit | fe63045f075165b1be5d3e7fc5c710021d85f53b (patch) | |
| tree | c60f764504ba1d622613a432c88e43f7f65c0fec /gm/perlinnoise.cpp | |
| parent | cce49271124ff75c880dc0dfed1489f02c82890b (diff) | |
move setshader to sk_sp, re-using SK_SUPPORT_LEGACY_CREATESHADER_PTR
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1829303002
Review URL: https://codereview.chromium.org/1829303002
Diffstat (limited to 'gm/perlinnoise.cpp')
| -rw-r--r-- | gm/perlinnoise.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gm/perlinnoise.cpp b/gm/perlinnoise.cpp index 92f0f963c3..b3ece9dcb6 100644 --- a/gm/perlinnoise.cpp +++ b/gm/perlinnoise.cpp @@ -37,13 +37,13 @@ protected: float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, bool stitchTiles) { SkISize tileSize = SkISize::Make(fSize.width() / 2, fSize.height() / 2); - SkShader* shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? - SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, - seed, stitchTiles ? &tileSize : nullptr) : - SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, + sk_sp<SkShader> shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? + SkPerlinNoiseShader::MakeFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &tileSize : nullptr) : + SkPerlinNoiseShader::MakeTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &tileSize : nullptr); SkPaint paint; - paint.setShader(shader)->unref(); + paint.setShader(std::move(shader)); if (stitchTiles) { drawRect(canvas, x, y, paint, tileSize); x += tileSize.width(); @@ -110,12 +110,12 @@ protected: void install(SkPaint* paint, SkPerlinNoiseShader::Type type, float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, bool stitchTiles) { - SkShader* shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? - SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, - seed, stitchTiles ? &fSize : nullptr) : - SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, - seed, stitchTiles ? &fSize : nullptr); - paint->setShader(shader)->unref(); + sk_sp<SkShader> shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? + SkPerlinNoiseShader::MakeFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &fSize : nullptr) : + SkPerlinNoiseShader::MakeTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &fSize : nullptr); + paint->setShader(std::move(shader)); } virtual void onDraw(SkCanvas* canvas) { |