aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkMallocPixelRef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/SkMallocPixelRef.cpp')
-rw-r--r--src/core/SkMallocPixelRef.cpp126
1 files changed, 59 insertions, 67 deletions
diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp
index 0d758fcb3d..7197aebae5 100644
--- a/src/core/SkMallocPixelRef.cpp
+++ b/src/core/SkMallocPixelRef.cpp
@@ -37,22 +37,23 @@ static bool is_valid(const SkImageInfo& info, SkColorTable* ctable) {
return true;
}
-SkMallocPixelRef* SkMallocPixelRef::NewDirect(const SkImageInfo& info,
- void* addr,
- size_t rowBytes,
- SkColorTable* ctable) {
- if (!is_valid(info, ctable)) {
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeDirect(const SkImageInfo& info,
+ void* addr,
+ size_t rowBytes,
+ sk_sp<SkColorTable> ctable) {
+ if (!is_valid(info, ctable.get())) {
return nullptr;
}
- return new SkMallocPixelRef(info, addr, rowBytes, ctable, nullptr, nullptr);
+ return sk_sp<SkPixelRef>(new SkMallocPixelRef(info, addr, rowBytes, std::move(ctable),
+ nullptr, nullptr));
}
- SkMallocPixelRef* SkMallocPixelRef::NewUsing(void*(*alloc)(size_t),
- const SkImageInfo& info,
- size_t requestedRowBytes,
- SkColorTable* ctable) {
- if (!is_valid(info, ctable)) {
+ sk_sp<SkPixelRef> SkMallocPixelRef::MakeUsing(void*(*alloc)(size_t),
+ const SkImageInfo& info,
+ size_t requestedRowBytes,
+ sk_sp<SkColorTable> ctable) {
+ if (!is_valid(info, ctable.get())) {
return nullptr;
}
@@ -84,62 +85,59 @@ SkMallocPixelRef* SkMallocPixelRef::NewDirect(const SkImageInfo& info,
return nullptr;
}
- return new SkMallocPixelRef(info, addr, rowBytes, ctable, sk_free_releaseproc, nullptr);
+ return sk_sp<SkPixelRef>(new SkMallocPixelRef(info, addr, rowBytes, std::move(ctable),
+ sk_free_releaseproc, nullptr));
}
-SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeAllocate(const SkImageInfo& info,
size_t rowBytes,
- SkColorTable* ctable) {
+ sk_sp<SkColorTable> ctable) {
auto sk_malloc_nothrow = [](size_t size) { return sk_malloc_flags(size, 0); };
- return NewUsing(sk_malloc_nothrow, info, rowBytes, ctable);
+ return MakeUsing(sk_malloc_nothrow, info, rowBytes, std::move(ctable));
}
-SkMallocPixelRef* SkMallocPixelRef::NewZeroed(const SkImageInfo& info,
- size_t rowBytes,
- SkColorTable* ctable) {
- return NewUsing(sk_calloc, info, rowBytes, ctable);
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeZeroed(const SkImageInfo& info,
+ size_t rowBytes,
+ sk_sp<SkColorTable> ctable) {
+ return MakeUsing(sk_calloc, info, rowBytes, std::move(ctable));
}
-SkMallocPixelRef* SkMallocPixelRef::NewWithProc(const SkImageInfo& info,
- size_t rowBytes,
- SkColorTable* ctable,
- void* addr,
- SkMallocPixelRef::ReleaseProc proc,
- void* context) {
- if (!is_valid(info, ctable)) {
+static void sk_data_releaseproc(void*, void* dataPtr) {
+ (static_cast<SkData*>(dataPtr))->unref();
+}
+
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeWithProc(const SkImageInfo& info,
+ size_t rowBytes,
+ sk_sp<SkColorTable> ctable,
+ void* addr,
+ SkMallocPixelRef::ReleaseProc proc,
+ void* context) {
+ if (!is_valid(info, ctable.get())) {
if (proc) {
proc(addr, context);
}
return nullptr;
}
- return new SkMallocPixelRef(info, addr, rowBytes, ctable, proc, context);
+ return sk_sp<SkPixelRef>(new SkMallocPixelRef(info, addr, rowBytes, std::move(ctable),
+ proc, context));
}
-static void sk_data_releaseproc(void*, void* dataPtr) {
- (static_cast<SkData*>(dataPtr))->unref();
-}
-
-SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeWithData(const SkImageInfo& info,
size_t rowBytes,
- SkColorTable* ctable,
- SkData* data) {
+ sk_sp<SkColorTable> ctable,
+ sk_sp<SkData> data) {
SkASSERT(data != nullptr);
- if (!is_valid(info, ctable)) {
+ if (!is_valid(info, ctable.get())) {
return nullptr;
}
if ((rowBytes < info.minRowBytes())
|| (data->size() < info.getSafeSize(rowBytes))) {
return nullptr;
}
- data->ref();
- SkMallocPixelRef* pr =
- new SkMallocPixelRef(info, const_cast<void*>(data->data()), rowBytes, ctable,
- sk_data_releaseproc, static_cast<void*>(data));
- SkASSERT(pr != nullptr);
- // We rely on the immutability of the pixels to make the
- // const_cast okay.
- pr->setImmutable();
- return pr;
+ SkPixelRef* pr = new SkMallocPixelRef(info, const_cast<void*>(data->data()), rowBytes,
+ std::move(ctable), sk_data_releaseproc, data.release());
+ pr->setImmutable(); // since we were created with (immutable) data
+ return sk_sp<SkPixelRef>(pr);
}
///////////////////////////////////////////////////////////////////////////////
@@ -148,50 +146,47 @@ SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage,
size_t rowBytes, SkColorTable* ctable,
bool ownsPixels)
: INHERITED(info)
+ , fCTable(sk_ref_sp(ctable))
, fReleaseProc(ownsPixels ? sk_free_releaseproc : nullptr)
, fReleaseProcContext(nullptr) {
// This constructor is now DEPRICATED.
- SkASSERT(is_valid(info, ctable));
+ SkASSERT(is_valid(info, fCTable.get()));
SkASSERT(rowBytes >= info.minRowBytes());
if (kIndex_8_SkColorType != info.colorType()) {
- ctable = nullptr;
+ fCTable = nullptr;
}
fStorage = storage;
- fCTable = ctable;
fRB = rowBytes;
- SkSafeRef(ctable);
- this->setPreLocked(fStorage, rowBytes, fCTable);
+ this->setPreLocked(fStorage, rowBytes, fCTable.get());
}
SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage,
- size_t rowBytes, SkColorTable* ctable,
+ size_t rowBytes, sk_sp<SkColorTable> ctable,
SkMallocPixelRef::ReleaseProc proc,
void* context)
: INHERITED(info)
, fReleaseProc(proc)
, fReleaseProcContext(context)
{
- SkASSERT(is_valid(info, ctable));
+ SkASSERT(is_valid(info, ctable.get()));
SkASSERT(rowBytes >= info.minRowBytes());
if (kIndex_8_SkColorType != info.colorType()) {
- ctable = nullptr;
+ ctable.reset(nullptr);
}
fStorage = storage;
- fCTable = ctable;
+ fCTable = std::move(ctable);
fRB = rowBytes;
- SkSafeRef(ctable);
- this->setPreLocked(fStorage, rowBytes, fCTable);
+ this->setPreLocked(fStorage, rowBytes, fCTable.get());
}
SkMallocPixelRef::~SkMallocPixelRef() {
- SkSafeUnref(fCTable);
if (fReleaseProc != nullptr) {
fReleaseProc(fStorage, fReleaseProcContext);
}
@@ -200,7 +195,7 @@ SkMallocPixelRef::~SkMallocPixelRef() {
bool SkMallocPixelRef::onNewLockPixels(LockRec* rec) {
rec->fPixels = fStorage;
rec->fRowBytes = fRB;
- rec->fColorTable = fCTable;
+ rec->fColorTable = fCTable.get();
return true;
}
@@ -212,14 +207,11 @@ size_t SkMallocPixelRef::getAllocatedSizeInBytes() const {
return this->info().getSafeSize(fRB);
}
-///////////////////////////////////////////////////////////////////////////////
-
-SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info, size_t rowBytes,
- SkColorTable* ctable) {
- return SkMallocPixelRef::NewAllocate(info, rowBytes, ctable);
-}
-
-SkPixelRef* SkMallocPixelRef::ZeroedPRFactory::create(const SkImageInfo& info, size_t rowBytes,
- SkColorTable* ctable) {
- return SkMallocPixelRef::NewZeroed(info, rowBytes, ctable);
+#ifdef SK_SUPPORT_LEGACY_PIXELREFFACTORY
+SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
+ size_t rowBytes,
+ SkColorTable* ctable,
+ SkData* data) {
+ return (SkMallocPixelRef*)MakeWithData(info, rowBytes, sk_ref_sp(ctable), sk_ref_sp(data)).release();
}
+#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 16:55:11 +0000