Rename SkAutoFree -> UniqueVoidPtr and move to private
Change-Id: I0a4385439ddd13dc6e6667c1a61d425be93a4c28
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/633576
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/include/private/base/SkTemplates.h b/include/private/base/SkTemplates.h
index a619f31..cbcf36c 100644
--- a/include/private/base/SkTemplates.h
+++ b/include/private/base/SkTemplates.h
@@ -408,12 +408,10 @@
};
};
+using UniqueVoidPtr = std::unique_ptr<void, SkOverloadedFunctionObject<void(void*), sk_free>>;
+
} // namespace skia_private
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-using SkAutoFree = std::unique_ptr<void, SkOverloadedFunctionObject<void(void*), sk_free>>;
-
template<typename C, std::size_t... Is>
constexpr auto SkMakeArrayFromIndexSequence(C c, std::index_sequence<Is...> is)
-> std::array<decltype(c(std::declval<typename decltype(is)::value_type>())), sizeof...(Is)> {
diff --git a/src/codec/SkBmpBaseCodec.h b/src/codec/SkBmpBaseCodec.h
index 3acd107..d3a65fc 100644
--- a/src/codec/SkBmpBaseCodec.h
+++ b/src/codec/SkBmpBaseCodec.h
@@ -38,7 +38,7 @@
uint8_t* srcBuffer() { return reinterpret_cast<uint8_t*>(fSrcBuffer.get()); }
private:
- SkAutoFree fSrcBuffer;
+ skia_private::UniqueVoidPtr fSrcBuffer;
using INHERITED = SkBmpCodec;
};
diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp
index 0f227eb..f9f262c 100644
--- a/src/codec/SkIcoCodec.cpp
+++ b/src/codec/SkIcoCodec.cpp
@@ -25,6 +25,8 @@
#include <cstring>
#include <utility>
+using namespace skia_private;
+
class SkSampler;
/*
@@ -82,7 +84,7 @@
uint32_t offset;
uint32_t size;
};
- SkAutoFree dirEntryBuffer(sk_malloc_canfail(sizeof(Entry) * numImages));
+ UniqueVoidPtr dirEntryBuffer(sk_malloc_canfail(sizeof(Entry) * numImages));
if (!dirEntryBuffer) {
SkCodecPrintf("Error: OOM allocating ICO directory for %i images.\n",
numImages);
diff --git a/src/core/SkDistanceFieldGen.cpp b/src/core/SkDistanceFieldGen.cpp
index ee5601f..828ba25 100644
--- a/src/core/SkDistanceFieldGen.cpp
+++ b/src/core/SkDistanceFieldGen.cpp
@@ -15,6 +15,8 @@
#include <utility>
+using namespace skia_private;
+
#if !defined(SK_DISABLE_SDF_TEXT)
struct DFData {
@@ -359,7 +361,7 @@
int dataHeight = height + 2*pad;
// create zeroed temp DFData+edge storage
- SkAutoFree storage(sk_calloc_throw(dataWidth*dataHeight*(sizeof(DFData) + 1)));
+ UniqueVoidPtr storage(sk_calloc_throw(dataWidth*dataHeight*(sizeof(DFData) + 1)));
DFData* dataPtr = (DFData*)storage.get();
unsigned char* edgePtr = (unsigned char*)storage.get() + dataWidth*dataHeight*sizeof(DFData);
diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp
index 3c1d73f..ad44469 100644
--- a/src/lazy/SkDiscardableMemoryPool.cpp
+++ b/src/lazy/SkDiscardableMemoryPool.cpp
@@ -12,6 +12,8 @@
#include "src/core/SkTInternalLList.h"
#include "src/lazy/SkDiscardableMemoryPool.h"
+using namespace skia_private;
+
// Note:
// A PoolDiscardableMemory is memory that is counted in a pool.
// A DiscardableMemoryPool is a pool of PoolDiscardableMemorys.
@@ -77,7 +79,7 @@
*/
class PoolDiscardableMemory : public SkDiscardableMemory {
public:
- PoolDiscardableMemory(sk_sp<DiscardableMemoryPool> pool, SkAutoFree pointer, size_t bytes);
+ PoolDiscardableMemory(sk_sp<DiscardableMemoryPool> pool, UniqueVoidPtr pointer, size_t bytes);
~PoolDiscardableMemory() override;
bool lock() override;
void* data() override;
@@ -87,12 +89,12 @@
SK_DECLARE_INTERNAL_LLIST_INTERFACE(PoolDiscardableMemory);
sk_sp<DiscardableMemoryPool> fPool;
bool fLocked;
- SkAutoFree fPointer;
+ UniqueVoidPtr fPointer;
const size_t fBytes;
};
PoolDiscardableMemory::PoolDiscardableMemory(sk_sp<DiscardableMemoryPool> pool,
- SkAutoFree pointer,
+ UniqueVoidPtr pointer,
size_t bytes)
: fPool(std::move(pool)), fLocked(true), fPointer(std::move(pointer)), fBytes(bytes) {
SkASSERT(fPool != nullptr);
@@ -163,7 +165,7 @@
}
std::unique_ptr<SkDiscardableMemory> DiscardableMemoryPool::make(size_t bytes) {
- SkAutoFree addr(sk_malloc_canfail(bytes));
+ UniqueVoidPtr addr(sk_malloc_canfail(bytes));
if (nullptr == addr) {
return nullptr;
}
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 67a12e4..ae383ca 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -305,7 +305,7 @@
rec->fFace->family_name);
return;
}
- SkAutoFree autoFreeVariations(variations);
+ UniqueVoidPtr autoFreeVariations(variations);
if (static_cast<FT_UInt>(data.getAxisCount()) != variations->num_axis) {
LOG_INFO("INFO: font %s has %d variations, but %d were specified.\n",
@@ -719,7 +719,7 @@
if (FT_Get_MM_Var(face, &variations)) {
return -1;
}
- SkAutoFree autoFreeVariations(variations);
+ UniqueVoidPtr autoFreeVariations(variations);
if (!coordinates || coordinateCount < SkToInt(variations->num_axis)) {
return variations->num_axis;
@@ -1857,7 +1857,7 @@
if (FT_Get_MM_Var(face, &variations)) {
return -1;
}
- SkAutoFree autoFreeVariations(variations);
+ UniqueVoidPtr autoFreeVariations(variations);
if (!parameters || parameterCount < SkToInt(variations->num_axis)) {
return variations->num_axis;
@@ -2214,7 +2214,7 @@
face->family_name);
return false;
}
- SkAutoFree autoFreeVariations(variations);
+ UniqueVoidPtr autoFreeVariations(variations);
axes->reset(variations->num_axis);
for (FT_UInt i = 0; i < variations->num_axis; ++i) {
