experimental/fiddle: update to new SkImage API

experimental/fiddle/fiddle_main.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <stdio.h>
 
 #include <GL/osmesa.h>
 
 #include "fiddle_main.h"
 
 // Globals externed in fiddle_main.h
 SkBitmap source;
-SkImage* image(nullptr);
+sk_sp<SkImage> image;
 
 static void encode_to_base64(const void* data, size_t size, FILE* out) {
     const uint8_t* input = reinterpret_cast<const uint8_t*>(data);
     const uint8_t* end = &input[size];
     static const char codes[] =
             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
             "abcdefghijklmnopqrstuvwxyz0123456789+/";
     while (input != end) {
         uint8_t b = (*input & 0xFC) >> 2;
         fputc(codes[b], out);
@@ skipping 24 matching lines @@
 static void dump_output(const sk_sp<SkData>& data,
                         const char* name, bool last = true) {
     if (data) {
         printf("\t\"%s\": \"", name);
         encode_to_base64(data->data(), data->size(), stdout);
         fputs(last ? "\"\n" : "\",\n", stdout);
     }
 }
 
 static SkData* encode_snapshot(const sk_sp<SkSurface>& surface) {
-    sk_sp<SkImage> img(surface->newImageSnapshot());
+    sk_sp<SkImage> img(surface->makeImageSnapshot());
     return img ? img->encode() : nullptr;
 }
 
 static OSMesaContext create_osmesa_context() {
     OSMesaContext osMesaContext =
         OSMesaCreateContextExt(OSMESA_BGRA, 0, 0, 0, nullptr);
     if (osMesaContext != nullptr) {
         static uint32_t buffer[16 * 16];
         OSMesaMakeCurrent(osMesaContext, &buffer, GL_UNSIGNED_BYTE, 16, 16);
     }
@@ skipping 19 matching lines @@
 }
 
 int main() {
     const DrawOptions options = GetDrawOptions();
     if (options.source) {
         sk_sp<SkData> data(SkData::NewFromFileName(options.source));
         if (!data) {
             perror(options.source);
             return 1;
         } else {
-            image = SkImage::NewFromEncoded(data.get());
+            image = SkImage::MakeFromEncoded(std::move(data));
             if (!image) {
                 perror("Unable to decode the source image.");
                 return 1;
             }
             SkAssertResult(image->asLegacyBitmap(
                                    &source, SkImage::kRO_LegacyBitmapMode));
         }
     }
     sk_sp<SkData> rasterData, gpuData, pdfData, skpData;
     if (options.raster) {
@@ skipping 41 matching lines @@
         skpData.reset(skpStream.copyToData());
     }
 
     printf("{\n");
     dump_output(rasterData, "Raster", !gpuData && !pdfData && !skpData);
     dump_output(gpuData, "Gpu", !pdfData && !skpData);
     dump_output(pdfData, "Pdf", !skpData);
     dump_output(skpData, "Skp");
     printf("}\n");
 
-    SkSafeSetNull(image);
     return 0;
 }