diff options
author | Mike Klein <mtklein@chromium.org> | 2017-03-31 16:45:04 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:45:09 +0000 |
commit | 1d1165ca6575e082b892c5460492c411618783ad (patch) | |
tree | d0c8be9303b4033e2eac559a104a9c1129430dbd /include/core/SkMallocPixelRef.h | |
parent | 43e5fd3e2095aa47630ff3a8b6da4139968d0492 (diff) |
Revert "clean up (partially) colortable api"
This reverts commit 2e491a6a113c5e16a3b7bede5fa6f588deeb928d.
Reason for revert: Windows unit tests failing?
Original change's description:
> clean up (partially) colortable api
>
> Needs this to land: https://codereview.chromium.org/2789853002/
>
> Bug: skia:
> Change-Id: I38d916a546b7fa64d000d973e695ddda24a589e7
> Reviewed-on: https://skia-review.googlesource.com/10600
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,scroggo@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I626e7edfcea82576a440dcaa851a04cedee6233f
Reviewed-on: https://skia-review.googlesource.com/10966
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include/core/SkMallocPixelRef.h')
-rw-r--r-- | include/core/SkMallocPixelRef.h | 83 |
1 files changed, 39 insertions, 44 deletions
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h index 2e4c4e69eb..bb07fa2dab 100644 --- a/include/core/SkMallocPixelRef.h +++ b/include/core/SkMallocPixelRef.h @@ -22,10 +22,12 @@ public: * lifetime of the pixel storage buffer, as this pixelref will not try * to delete it. * + * The pixelref will ref() the colortable (if not NULL). + * * Returns NULL on failure. */ - static sk_sp<SkPixelRef> MakeDirect(const SkImageInfo&, void* addr, - size_t rowBytes, sk_sp<SkColorTable>); + static SkMallocPixelRef* NewDirect(const SkImageInfo&, void* addr, + size_t rowBytes, SkColorTable*); /** * Return a new SkMallocPixelRef, automatically allocating storage for the @@ -37,18 +39,22 @@ public: * * Returns NULL on failure. */ - static sk_sp<SkPixelRef> MakeAllocate(const SkImageInfo&, size_t rowBytes, sk_sp<SkColorTable>); + static SkMallocPixelRef* NewAllocate(const SkImageInfo& info, + size_t rowBytes, SkColorTable*); /** - * Identical to MakeAllocate, except all pixel bytes are zeroed. + * Identical to NewAllocate, except all pixel bytes are zeroed. */ - static sk_sp<SkPixelRef> MakeZeroed(const SkImageInfo&, size_t rowBytes, sk_sp<SkColorTable>); + static SkMallocPixelRef* NewZeroed(const SkImageInfo& info, + size_t rowBytes, SkColorTable*); /** * Return a new SkMallocPixelRef with the provided pixel storage, * rowBytes, and optional colortable. On destruction, ReleaseProc * will be called. * + * This pixelref will ref() the specified colortable (if not NULL). + * * If ReleaseProc is NULL, the pixels will never be released. This * can be useful if the pixels were stack allocated. However, such an * SkMallocPixelRef must not live beyond its pixels (e.g. by copying @@ -57,10 +63,10 @@ public: * Returns NULL on failure. */ typedef void (*ReleaseProc)(void* addr, void* context); - static sk_sp<SkPixelRef> MakeWithProc(const SkImageInfo& info, - size_t rowBytes, sk_sp<SkColorTable>, - void* addr, ReleaseProc proc, - void* context); + static SkMallocPixelRef* NewWithProc(const SkImageInfo& info, + size_t rowBytes, SkColorTable*, + void* addr, ReleaseProc proc, + void* context); /** * Return a new SkMallocPixelRef that will use the provided @@ -68,38 +74,27 @@ public: * The SkData will be ref()ed and on destruction of the PielRef, * the SkData will be unref()ed. * + * This pixelref will ref() the specified colortable (if not NULL). + * * Returns NULL on failure. */ - static sk_sp<SkPixelRef> MakeWithData(const SkImageInfo& info, - size_t rowBytes, - sk_sp<SkColorTable>, - sk_sp<SkData> data); - -#ifdef SK_SUPPORT_LEGACY_PIXELREFFACTORY - static SkMallocPixelRef* NewDirect(const SkImageInfo& info, void* addr, - size_t rowBytes, SkColorTable* ctable) { - return (SkMallocPixelRef*)MakeDirect(info, addr, rowBytes, sk_ref_sp(ctable)).release(); - } - static SkMallocPixelRef* NewAllocate(const SkImageInfo& info, size_t rb, SkColorTable* ct) { - return (SkMallocPixelRef*)MakeAllocate(info, rb, sk_ref_sp(ct)).release(); - } - static SkMallocPixelRef* NewZeroed(const SkImageInfo& info, size_t rowBytes, SkColorTable* ct) { - return (SkMallocPixelRef*)MakeZeroed(info, rowBytes, sk_ref_sp(ct)).release(); - } - static SkMallocPixelRef* NewWithProc(const SkImageInfo& info, - size_t rowBytes, SkColorTable* ctable, - void* addr, ReleaseProc proc, - void* ctx) { - return (SkMallocPixelRef*)MakeWithProc(info, rowBytes, sk_ref_sp(ctable), addr, proc, ctx).release(); - } static SkMallocPixelRef* NewWithData(const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable, SkData* data); -#endif void* getAddr() const { return fStorage; } + class PRFactory : public SkPixelRefFactory { + public: + SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) override; + }; + + class ZeroedPRFactory : public SkPixelRefFactory { + public: + SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) override; + }; + protected: // The ownPixels version of this constructor is deprecated. SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*, @@ -112,18 +107,18 @@ protected: private: // Uses alloc to implement NewAllocate or NewZeroed. - static sk_sp<SkPixelRef> MakeUsing(void*(*alloc)(size_t), - const SkImageInfo&, - size_t rowBytes, - sk_sp<SkColorTable>); - - void* fStorage; - sk_sp<SkColorTable> fCTable; - size_t fRB; - ReleaseProc fReleaseProc; - void* fReleaseProcContext; - - SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, sk_sp<SkColorTable>, + static SkMallocPixelRef* NewUsing(void*(*alloc)(size_t), + const SkImageInfo&, + size_t rowBytes, + SkColorTable*); + + void* fStorage; + SkColorTable* fCTable; + size_t fRB; + ReleaseProc fReleaseProc; + void* fReleaseProcContext; + + SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*, ReleaseProc proc, void* context); typedef SkPixelRef INHERITED; |