return pictures as sk_sp

tools/skiaserve/Request.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Request.h"
 
 #include "png.h"
@@ skipping 113 matching lines @@
 }
 
 SkData* Request::writeOutSkp() {
     // Playback into picture recorder
     SkIRect bounds = this->getBounds();
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(bounds.width(), bounds.height());
 
     fDebugCanvas->draw(canvas);
 
-    SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+    sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
 
     SkDynamicMemoryWStream outStream;
 
     SkAutoTUnref<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer());
     picture->serialize(&outStream, serializer);
 
     return outStream.copyToData();
 }
 
 GrContext* Request::getContext() {
@@ skipping 63 matching lines @@
         }
         return false;
     }
     fSurface.reset(this->createCPUSurface());
     fGPUEnabled = false;
     return true;
 } 
 
 bool Request::initPictureFromStream(SkStream* stream) {
     // parse picture from stream
-    fPicture.reset(SkPicture::CreateFromStream(stream));
-    if (!fPicture.get()) {
+    fPicture = SkPicture::MakeFromStream(stream);
+    if (!fPicture) {
         fprintf(stderr, "Could not create picture from stream.\n");
         return false;
     }
 
     // reinitialize canvas with the new picture dimensions
     this->enableGPU(fGPUEnabled);
 
     // pour picture into debug canvas
     SkIRect bounds = this->getBounds();
     fDebugCanvas.reset(new SkDebugCanvas(bounds.width(), bounds.height()));
@@ skipping 54 matching lines @@
     canvas->flush();
     SkAutoTDelete<SkBitmap> bitmap(this->getBitmapFromCanvas(canvas));
     SkASSERT(bitmap);
     bitmap->lockPixels();
     uint8_t* start = ((uint8_t*) bitmap->getPixels()) + (y * bitmap->width() + x) * 4;
     SkColor result = SkColorSetARGB(start[3], start[0], start[1], start[2]);
     bitmap->unlockPixels();
     return result;
 }