return pictures as sk_sp

src/core/SkMiniRecorder.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 "SkCanvas.h"
 #include "SkTLazy.h"
 #include "SkMiniRecorder.h"
@@ skipping 44 matching lines @@
     SkRect fCull;
     T      fOp;
 };
 
 
 SkMiniRecorder::SkMiniRecorder() : fState(State::kEmpty) {}
 SkMiniRecorder::~SkMiniRecorder() {
     if (fState != State::kEmpty) {
         // We have internal state pending.
         // Detaching then deleting a picture is an easy way to clean up.
-        delete this->detachAsPicture(SkRect::MakeEmpty());
+        (void)this->detachAsPicture(SkRect::MakeEmpty());
     }
     SkASSERT(fState == State::kEmpty);
 }
 
 #define TRY_TO_STORE(Type, ...)                    \
     if (fState != State::kEmpty) { return false; } \
     fState = State::k##Type;                       \
     new (fBuffer.get()) Type{__VA_ARGS__};         \
     return true
 
@@ skipping 18 matching lines @@
 bool SkMiniRecorder::drawPath(const SkPath& path, const SkPaint& paint) {
     TRY_TO_STORE(DrawPath, paint, path);
 }
 
 bool SkMiniRecorder::drawTextBlob(const SkTextBlob* b, SkScalar x, SkScalar y, const SkPaint& p) {
     TRY_TO_STORE(DrawTextBlob, p, b, x, y);
 }
 #undef TRY_TO_STORE
 
 
-SkPicture* SkMiniRecorder::detachAsPicture(const SkRect& cull) {
+sk_sp<SkPicture> SkMiniRecorder::detachAsPicture(const SkRect& cull) {
 #define CASE(Type)              \
     case State::k##Type:        \
         fState = State::kEmpty; \
-        return new SkMiniPicture<Type>(cull, reinterpret_cast<Type*>(fBuffer.get()))
+        return sk_make_sp<SkMiniPicture<Type>>(cull, reinterpret_cast<Type*>(fBuffer.get()))
 
     switch (fState) {
-        case State::kEmpty: return SkRef(gEmptyPicture.get([]{ return new SkEmptyPicture; }));
+        case State::kEmpty: return sk_ref_sp(gEmptyPicture.get([]{ return new SkEmptyPicture; }));
         CASE(DrawBitmapRectFixedSize);
         CASE(DrawPath);
         CASE(DrawRect);
         CASE(DrawTextBlob);
     }
     SkASSERT(false);
     return nullptr;
 #undef CASE
 }
 
 void SkMiniRecorder::flushAndReset(SkCanvas* canvas) {
 #define CASE(Type)                                                  \
     case State::k##Type: {                                          \
         fState = State::kEmpty;                                     \
         Type* op = reinterpret_cast<Type*>(fBuffer.get());          \
         SkRecords::Draw(canvas, nullptr, nullptr, 0, nullptr)(*op); \
         op->~Type();                                                \
     } return
 
     switch (fState) {
         case State::kEmpty: return;
         CASE(DrawBitmapRectFixedSize);
         CASE(DrawPath);
         CASE(DrawRect);
         CASE(DrawTextBlob);
     }
     SkASSERT(false);
 #undef CASE
 }