From e51125557f28c2fc3dfbf4a8553a7c06bc1a0286 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 24 Apr 2017 22:48:00 -0700 Subject: [PATCH] remove legacy code Bug: skia: Change-Id: I719f68489e9295ec652ccb04de3b10632df534fa Reviewed-on: https://skia-review.googlesource.com/14226 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/core/SkMallocPixelRef.h | 23 ----------------------- src/core/SkMallocPixelRef.cpp | 9 --------- 2 files changed, 32 deletions(-) diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h index e378da7..45ab654 100644 --- a/include/core/SkMallocPixelRef.h +++ b/include/core/SkMallocPixelRef.h @@ -74,29 +74,6 @@ public: size_t rowBytes, sk_sp, sk_sp 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 protected: ~SkMallocPixelRef() override; diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp index f49c1ca..cdc555b 100644 --- a/src/core/SkMallocPixelRef.cpp +++ b/src/core/SkMallocPixelRef.cpp @@ -171,12 +171,3 @@ SkMallocPixelRef::~SkMallocPixelRef() { size_t SkMallocPixelRef::getAllocatedSizeInBytes() const { return this->info().getSafeSize(this->rowBytes()); } - -#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 -- 2.7.4