From fe63045f075165b1be5d3e7fc5c710021d85f53b Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 25 Mar 2016 09:08:00 -0700 Subject: 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 --- bench/PerlinNoiseBench.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bench/PerlinNoiseBench.cpp') diff --git a/bench/PerlinNoiseBench.cpp b/bench/PerlinNoiseBench.cpp index 7c4894d434..6c98374bc3 100644 --- a/bench/PerlinNoiseBench.cpp +++ b/bench/PerlinNoiseBench.cpp @@ -41,13 +41,13 @@ private: void test(int loops, SkCanvas* canvas, int x, int y, 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); + sk_sp shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? + SkPerlinNoiseShader::MakeFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &fSize : nullptr) : + SkPerlinNoiseShader::MakeTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &fSize : nullptr); SkPaint paint; - paint.setShader(shader)->unref(); + paint.setShader(shader); for (int i = 0; i < loops; i++) { this->drawClippedRect(canvas, x, y, paint); -- cgit v1.2.3