diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-04 13:02:54 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 15:17:32 +0000 |
| commit | 2db83612576d64935bd88747cf9855e79cad70d4 (patch) | |
| tree | 2e9cbd612abc2a52dc1bb8c594d328ddee2b93fa /experimental | |
| parent | 12313f072b3563d652a789e28140f70b48e57e03 (diff) | |
bench, samples, etc: s/SkAutoTUnref/sk_sp/
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4437
Change-Id: Ice071684ac8a99e4bb405b4b9be8e8f42c7bac42
Reviewed-on: https://skia-review.googlesource.com/4437
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/GLFWTest/glfw_main.cpp | 2 | ||||
| -rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 13 | ||||
| -rw-r--r-- | experimental/SkV8Example/SkV8Example.cpp | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/experimental/GLFWTest/glfw_main.cpp b/experimental/GLFWTest/glfw_main.cpp index 21ec33def3..63ea1f1d9f 100644 --- a/experimental/GLFWTest/glfw_main.cpp +++ b/experimental/GLFWTest/glfw_main.cpp @@ -76,7 +76,7 @@ int main(void) { init_skia(kWidth, kHeight); - SkAutoTUnref<SkImage> atlas; + sk_sp<SkImage> atlas; SkRSXform xform[kGrid*kGrid+1]; SkRect tex[kGrid*kGrid+1]; WallTimer timer; diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index c0652bfa98..fcbf017c43 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -1321,14 +1321,15 @@ sk_sp<GrFragmentProcessor> SkPerlinNoiseShader2::asFragmentProcessor(const AsFPA if (fType == kImprovedNoise_Type) { GrTextureParams textureParams(SkShader::TileMode::kRepeat_TileMode, GrTextureParams::FilterMode::kNone_FilterMode); - SkAutoTUnref<GrTexture> permutationsTexture( + sk_sp<GrTexture> permutationsTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getImprovedPermutationsBitmap(), textureParams, args.fGammaTreatment)); - SkAutoTUnref<GrTexture> gradientTexture( + sk_sp<GrTexture> gradientTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getGradientBitmap(), textureParams, args.fGammaTreatment)); return GrImprovedPerlinNoiseEffect::Make(fNumOctaves, fSeed, paintingData, - permutationsTexture, gradientTexture, m); + permutationsTexture.get(), + gradientTexture.get(), m); } if (0 == fNumOctaves) { @@ -1347,10 +1348,10 @@ sk_sp<GrFragmentProcessor> SkPerlinNoiseShader2::asFragmentProcessor(const AsFPA GrConstColorProcessor::kIgnore_InputMode); } - SkAutoTUnref<GrTexture> permutationsTexture( + sk_sp<GrTexture> permutationsTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getPermutationsBitmap(), GrTextureParams::ClampNoFilter(), args.fGammaTreatment)); - SkAutoTUnref<GrTexture> noiseTexture( + sk_sp<GrTexture> noiseTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getNoiseBitmap(), GrTextureParams::ClampNoFilter(), args.fGammaTreatment)); @@ -1360,7 +1361,7 @@ sk_sp<GrFragmentProcessor> SkPerlinNoiseShader2::asFragmentProcessor(const AsFPA fNumOctaves, fStitchTiles, paintingData, - permutationsTexture, noiseTexture, + permutationsTexture.get(), noiseTexture.get(), m)); return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner)); } diff --git a/experimental/SkV8Example/SkV8Example.cpp b/experimental/SkV8Example/SkV8Example.cpp index 5bfd64d6e2..388ef0e187 100644 --- a/experimental/SkV8Example/SkV8Example.cpp +++ b/experimental/SkV8Example/SkV8Example.cpp @@ -108,7 +108,7 @@ void SkV8ExampleWindow::windowSizeChanged() { SkSurface* SkV8ExampleWindow::createSurface() { if (FLAGS_gpu) { // Increase the ref count since callers of createSurface put the - // results in a SkAutoTUnref. + // results in a sk_sp. fCurSurface->ref(); return fCurSurface; } else { |