commit e51125557f28c2fc3dfbf4a8553a7c06bc1a0286
author Mike Reed <reed@google.com> Mon Apr 24 22:48:00 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 27 14:45:53 2017 +0000
tree 33a8b0fb47879d70324fa2da427ea41edbf574f7
parent 4f7d97c16fd159f72d2ad9c105542e2c6c097ad6

remove legacy code

Bug: skia:
Change-Id: I719f68489e9295ec652ccb04de3b10632df534fa
Reviewed-on: https://skia-review.googlesource.com/14226
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

include/core/SkMallocPixelRef.h

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 @@
                                           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
 
 protected:
     ~SkMallocPixelRef() override;

src/core/SkMallocPixelRef.cpp

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 @@
 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