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>

gm/image.cpp

diff --git a/gm/image.cpp b/gm/image.cpp
index fc7a5ff..6bf9f01 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -253,8 +253,7 @@
 
 static sk_sp<SkImage> make_codec(const SkImageInfo& info, GrContext*, void (*draw)(SkCanvas*)) {
     sk_sp<SkImage> image(make_raster(info, nullptr, draw));
-    sk_sp<SkData> data(image->encode());
-    return SkImage::MakeFromEncoded(data);
+    return SkImage::MakeFromEncoded(image->encodeToData());
 }
 
 static sk_sp<SkImage> make_gpu(const SkImageInfo& info, GrContext* ctx, void (*draw)(SkCanvas*)) {

gm/image_shader.cpp

diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp
index 02e6679..5e55786 100644
--- a/gm/image_shader.cpp
+++ b/gm/image_shader.cpp
@@ -57,7 +57,7 @@
     if (!src) {
         return nullptr;
     }
-    sk_sp<SkData> encoded(src->encode(SkEncodedImageFormat::kPNG, 100));
+    sk_sp<SkData> encoded = src->encodeToData(SkEncodedImageFormat::kPNG, 100);
     if (!encoded) {
         return nullptr;
     }