aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2016-11-04 13:02:54 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-07 15:17:32 +0000
commit2db83612576d64935bd88747cf9855e79cad70d4 (patch)
tree2e9cbd612abc2a52dc1bb8c594d328ddee2b93fa /platform_tools
parent12313f072b3563d652a789e28140f70b48e57e03 (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 'platform_tools')
-rw-r--r--platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp2
-rw-r--r--platform_tools/android/apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp2
2 files changed, 2 insertions, 2 deletions
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<SkPicture> p(SkPicture::CreateFromStream(&stream));
+ sk_sp<SkPicture> 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<GrContext> fGrContext;
+ sk_sp<GrContext> fGrContext;
void render(int w, int h, const SkPicture* p, const SkMatrix& m) {
if (!fGrContext) {
// Cache the rendering context between frames.