Make sp variants for SkData

src/core/SkPictureData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <new>
 #include "SkImageGenerator.h"
 #include "SkPictureData.h"
 #include "SkPictureRecord.h"
@@ skipping 75 matching lines @@
     }
 }
 
 void SkPictureData::init() {
     fPictureRefs = nullptr;
     fPictureCount = 0;
     fTextBlobRefs = nullptr;
     fTextBlobCount = 0;
     fImageRefs = nullptr;
     fImageCount = 0;
-    fOpData = nullptr;
     fFactoryPlayback = nullptr;
 }
 
 SkPictureData::~SkPictureData() {
-    SkSafeUnref(fOpData);
-
     for (int i = 0; i < fPictureCount; i++) {
         fPictureRefs[i]->unref();
     }
     delete[] fPictureRefs;
 
     for (int i = 0; i < fTextBlobCount; i++) {
         fTextBlobRefs[i]->unref();
     }
     delete[] fTextBlobRefs;
 
@@ skipping 238 matching lines @@
      *
      *  We assert that if/when we see either of these, that we have not yet seen
      *  the buffer tag, because if we have, then its too-late to deal with the
      *  factories or typefaces.
      */
     SkDEBUGCODE(bool haveBuffer = false;)
 
     switch (tag) {
         case SK_PICT_READER_TAG:
             SkASSERT(nullptr == fOpData);
-            fOpData = SkData::NewFromStream(stream, size);
+            fOpData = SkData::MakeFromStream(stream, size);
             if (!fOpData) {
                 return false;
             }
             break;
         case SK_PICT_FACTORY_TAG: {
             SkASSERT(!haveBuffer);
             size = stream->readU32();
             fFactoryPlayback = new SkFactoryPlayback(size);
             for (size_t i = 0; i < size; i++) {
                 SkString str;
@@ skipping 150 matching lines @@
                 return false;
             }
             break;
         case SK_PICT_IMAGE_BUFFER_TAG:
             if (!new_array_from_buffer(buffer, size, &fImageRefs, &fImageCount,
                                        create_image_from_buffer)) {
                 return false;
             }
             break;
         case SK_PICT_READER_TAG: {
-            SkAutoDataUnref data(SkData::NewUninitialized(size));
+            auto data(SkData::MakeUninitialized(size));
             if (!buffer.readByteArray(data->writable_data(), size) ||
                 !buffer.validate(nullptr == fOpData)) {
                 return false;
             }
             SkASSERT(nullptr == fOpData);
-            fOpData = data.detach();
+            fOpData = std::move(data);
         } break;
         case SK_PICT_PICTURE_TAG:
             if (!new_array_from_buffer(buffer, size, &fPictureRefs, &fPictureCount,
                                        create_picture_from_buffer)) {
                 return false;
             }
             break;
         default:
             // The tag was invalid.
             return false;
@@ skipping 79 matching lines @@
     }
 }
 
 bool SkPictureData::suitableForLayerOptimization() const {
     return fContentInfo.numLayers() > 0;
 }
 #endif
 ///////////////////////////////////////////////////////////////////////////////