commit 185130c643f0f6b20dcf14c200074748be282a7e
author Mike Reed <reed@google.com> Wed Feb 15 15:14:16 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 15 20:51:28 2017 +0000
tree 049a9162c7ed7c298a4966000b9aa805f75282ad
parent eb62829a83a0a4f4fdd1230a3c08140e38052602

return and take SkImageGenerator as unique_ptr

BUG=skia:

Change-Id: I4bc11042dd1dbf1eabd40af206027bc65acc3186
Reviewed-on: https://skia-review.googlesource.com/8444
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 3b849c1..d28c3a2 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -907,7 +907,7 @@
     std::unique_ptr<SkImageGenerator> gen(nullptr);
     switch (fMode) {
         case kCodec_Mode:
-            gen.reset(SkCodecImageGenerator::NewFromEncodedCodec(encoded.get()));
+            gen = SkCodecImageGenerator::MakeFromEncodedCodec(encoded);
             if (!gen) {
                 return "Could not create codec image generator.";
             }
@@ -931,7 +931,7 @@
 
     // Test deferred decoding path on GPU
     if (fIsGpu) {
-        sk_sp<SkImage> image(SkImage::MakeFromGenerator(gen.release(), nullptr));
+        sk_sp<SkImage> image(SkImage::MakeFromGenerator(std::move(gen), nullptr));
         if (!image) {
             return "Could not create image from codec image generator.";
         }