From 2db83612576d64935bd88747cf9855e79cad70d4 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Fri, 4 Nov 2016 13:02:54 -0400 Subject: 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 Commit-Queue: Hal Canary --- .../canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp | 2 +- .../src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'platform_tools') diff --git a/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp b/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp index c5d9759e54..086cd5d42e 100644 --- a/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp +++ b/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp @@ -29,7 +29,7 @@ JNIEXPORT jlong JNICALL Java_org_skia_canvasproof_CreateSkiaPicture_createImpl (JNIEnv* env, jclass clazz, jobject inputStream, jbyteArray buffer) { JavaInputStream stream(env, buffer, inputStream); #if 0 - SkAutoTUnref p(SkPicture::CreateFromStream(&stream)); + sk_sp p(SkPicture::CreateFromStream(&stream)); if (!p) { return 0; } SkPictureRecorder recorder; SkRect bounds = p->cullRect(); diff --git a/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp b/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp index de38919fe5..1bdc655ef2 100644 --- a/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp +++ b/platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp @@ -53,7 +53,7 @@ static void render_picture(GrContext* grContext, namespace { struct GaneshPictureRendererImpl { - SkAutoTUnref fGrContext; + sk_sp fGrContext; void render(int w, int h, const SkPicture* p, const SkMatrix& m) { if (!fGrContext) { // Cache the rendering context between frames. -- cgit v1.2.3