diff options
author | Mike Reed <reed@google.com> | 2017-07-19 15:45:45 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-19 22:20:57 +0000 |
commit | b7648a27583a2ef775384751fee25ac9cf3db5d5 (patch) | |
tree | 60b385f2059f2c02312b6f4e4a4ceb33df3a4484 /include/core/SkMallocPixelRef.h | |
parent | 1635146864586cb7caaccdbfeb8ba4906bf80c67 (diff) |
removed dead colortable code
Bug: skia:6828
Change-Id: I2d3b3b7c846d3ac08bbcb9357cb644873fe5a286
Reviewed-on: https://skia-review.googlesource.com/24623
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'include/core/SkMallocPixelRef.h')
-rw-r--r-- | include/core/SkMallocPixelRef.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h index 07a5483e25..dce3c0ecbb 100644 --- a/include/core/SkMallocPixelRef.h +++ b/include/core/SkMallocPixelRef.h @@ -9,9 +9,6 @@ #define SkMallocPixelRef_DEFINED #include "SkPixelRef.h" -#ifdef SK_SUPPORT_LEGACY_COLORTABLE - #include "SkData.h" -#endif /** We explicitly use the same allocator for our pixels that SkMask does, so that we can freely assign memory allocated by one class to the other. @@ -71,31 +68,6 @@ public: */ static sk_sp<SkPixelRef> MakeWithData(const SkImageInfo&, size_t rowBytes, sk_sp<SkData> data); -#ifdef SK_SUPPORT_LEGACY_COLORTABLE - static sk_sp<SkPixelRef> MakeDirect(const SkImageInfo& info, void* addr, - size_t rowBytes, sk_sp<SkColorTable>) { - return MakeDirect(info, addr, rowBytes); - } - static sk_sp<SkPixelRef> MakeAllocate(const SkImageInfo& info, size_t rb, sk_sp<SkColorTable>) { - return MakeAllocate(info, rb); - } - static sk_sp<SkPixelRef> MakeZeroed(const SkImageInfo& info, size_t rb, sk_sp<SkColorTable>) { - return MakeZeroed(info, rb); - } - static sk_sp<SkPixelRef> MakeWithProc(const SkImageInfo& info, - size_t rowBytes, sk_sp<SkColorTable>, - void* addr, ReleaseProc proc, - void* context) { - return MakeWithProc(info, rowBytes, addr, proc, context); - } - static sk_sp<SkPixelRef> MakeWithData(const SkImageInfo& info, - size_t rowBytes, - sk_sp<SkColorTable>, - sk_sp<SkData> data) { - return MakeWithData(info, rowBytes, data); - } -#endif - protected: ~SkMallocPixelRef() override; |