Make sp variants for SkData

src/core/SkData.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 "SkData.h"
 #include "SkOSFile.h"
 #include "SkOncePtr.h"
@@ skipping 41 matching lines @@
     available -= offset;
     if (length > available) {
         length = available;
     }
     SkASSERT(length > 0);
 
     memcpy(buffer, this->bytes() + offset, length);
     return length;
 }
 
-SkData* SkData::PrivateNewWithCopy(const void* srcOrNull, size_t length) {
+sk_sp<SkData> SkData::PrivateNewWithCopy(const void* srcOrNull, size_t length) {
     if (0 == length) {
-        return SkData::NewEmpty();
+        return SkData::MakeEmpty();
     }
 
     const size_t actualLength = length + sizeof(SkData);
     if (actualLength < length) {
         // we overflowed
         sk_throw();
     }
 
     char* storage = (char*)sk_malloc_throw(actualLength);
     SkData* data = new (storage) SkData(length);
     if (srcOrNull) {
         memcpy(data->writable_data(), srcOrNull, length);
     }
-    return data;
+    return sk_sp<SkData>(data);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty);
-SkData* SkData::NewEmpty() {
-    return SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); }));
+sk_sp<SkData> SkData::MakeEmpty() {
+    SkData* data = SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); }));
+    return sk_sp<SkData>(data);
 }
 
 // assumes fPtr was allocated via sk_malloc
 static void sk_free_releaseproc(const void* ptr, void*) {
     sk_free((void*)ptr);
 }
 
-SkData* SkData::NewFromMalloc(const void* data, size_t length) {
-    return new SkData(data, length, sk_free_releaseproc, nullptr);
+sk_sp<SkData> SkData::MakeFromMalloc(const void* data, size_t length) {
+    return sk_sp<SkData>(new SkData(data, length, sk_free_releaseproc, nullptr));
 }
 
-SkData* SkData::NewWithCopy(const void* src, size_t length) {
+sk_sp<SkData> SkData::MakeWithCopy(const void* src, size_t length) {
     SkASSERT(src);
     return PrivateNewWithCopy(src, length);
 }
 
-SkData* SkData::NewUninitialized(size_t length) {
+sk_sp<SkData> SkData::MakeUninitialized(size_t length) {
     return PrivateNewWithCopy(nullptr, length);
 }
 
-SkData* SkData::NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context) {
-    return new SkData(ptr, length, proc, context);
+sk_sp<SkData> SkData::MakeWithProc(const void* ptr, size_t length, ReleaseProc proc, void* ctx) {
+    return sk_sp<SkData>(new SkData(ptr, length, proc, ctx));
 }
 
 // assumes fPtr was allocated with sk_fmmap
 static void sk_mmap_releaseproc(const void* addr, void* ctx) {
     size_t length = reinterpret_cast<size_t>(ctx);
     sk_fmunmap(addr, length);
 }
 
-SkData* SkData::NewFromFILE(FILE* f) {
+sk_sp<SkData> SkData::MakeFromFILE(FILE* f) {
     size_t size;
     void* addr = sk_fmmap(f, &size);
     if (nullptr == addr) {
         return nullptr;
     }
 
-    return SkData::NewWithProc(addr, size, sk_mmap_releaseproc, reinterpret_cast<void*>(size));
+    return SkData::MakeWithProc(addr, size, sk_mmap_releaseproc, reinterpret_cast<void*>(size));
 }
 
-SkData* SkData::NewFromFileName(const char path[]) {
+sk_sp<SkData> SkData::MakeFromFileName(const char path[]) {
     FILE* f = path ? sk_fopen(path, kRead_SkFILE_Flag) : nullptr;
     if (nullptr == f) {
         return nullptr;
     }
-    SkData* data = NewFromFILE(f);
+    auto data = MakeFromFILE(f);
     sk_fclose(f);
     return data;
 }
 
-SkData* SkData::NewFromFD(int fd) {
+sk_sp<SkData> SkData::MakeFromFD(int fd) {
     size_t size;
     void* addr = sk_fdmmap(fd, &size);
     if (nullptr == addr) {
         return nullptr;
     }
 
-    return SkData::NewWithProc(addr, size, sk_mmap_releaseproc, nullptr);
+    return SkData::MakeWithProc(addr, size, sk_mmap_releaseproc, nullptr);
 }
 
 // assumes context is a SkData
 static void sk_dataref_releaseproc(const void*, void* context) {
     SkData* src = reinterpret_cast<SkData*>(context);
     src->unref();
 }
 
-SkData* SkData::NewSubset(const SkData* src, size_t offset, size_t length) {
+sk_sp<SkData> SkData::MakeSubset(const SkData* src, size_t offset, size_t length) {
     /*
         We could, if we wanted/need to, just make a deep copy of src's data,
         rather than referencing it. This would duplicate the storage (of the
         subset amount) but would possibly allow src to go out of scope sooner.
      */
 
     size_t available = src->size();
     if (offset >= available || 0 == length) {
-        return SkData::NewEmpty();
+        return SkData::MakeEmpty();
     }
     available -= offset;
     if (length > available) {
         length = available;
     }
     SkASSERT(length > 0);
 
     src->ref(); // this will be balanced in sk_dataref_releaseproc
-    return new SkData(src->bytes() + offset, length, sk_dataref_releaseproc,
-                         const_cast<SkData*>(src));
+    return sk_sp<SkData>(new SkData(src->bytes() + offset, length, sk_dataref_releaseproc,
+                                    const_cast<SkData*>(src)));
 }
 
-SkData* SkData::NewWithCString(const char cstr[]) {
+sk_sp<SkData> SkData::MakeWithCString(const char cstr[]) {
     size_t size;
     if (nullptr == cstr) {
         cstr = "";
         size = 1;
     } else {
         size = strlen(cstr) + 1;
     }
-    return NewWithCopy(cstr, size);
+    return MakeWithCopy(cstr, size);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkData* SkData::NewFromStream(SkStream* stream, size_t size) {
-    SkAutoDataUnref data(SkData::NewUninitialized(size));
+sk_sp<SkData> SkData::MakeFromStream(SkStream* stream, size_t size) {
+    sk_sp<SkData> data(SkData::MakeUninitialized(size));
     if (stream->read(data->writable_data(), size) != size) {
         return nullptr;
     }
-    return data.detach();
+    return data;
 }