commit 6409f84fc3ae5e3b2df9eb0a900957fce404ad5c
author Mike Reed <reed@google.com> Tue Jul 11 16:03:13 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 12 15:44:35 2017 +0000
tree 41575591d345bf205d84d6d9e52a0e76c231be7d
parent ebb38256c65f2d799dd64f0274256a0c1deffed1

Revert "Revert "Change image encode api to return sk_sp""

This reverts commit 64778d9f275d8ce3df8f4ab39ff334b7ef5b70d3.

Bug: skia:
Change-Id: I779515ff1e16a40c33890a4bac7a8a07171aadfe
Reviewed-on: https://skia-review.googlesource.com/22261
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/pipe/SkPipeCanvas.cpp

diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp
index 7b665d9..226a957 100644
--- a/src/pipe/SkPipeCanvas.cpp
+++ b/src/pipe/SkPipeCanvas.cpp
@@ -828,9 +828,9 @@
 
 static sk_sp<SkData> default_image_serializer(SkImage* image) {
     A8Serializer serial;
-    sk_sp<SkData> data(image->encode(&serial));
+    sk_sp<SkData> data = image->encodeToData(&serial);
     if (!data) {
-        data.reset(image->encode());
+        data = image->encodeToData();
     }
     return data;
 }