diff options
Diffstat (limited to 'include/core/SkData.h')
-rw-r--r-- | include/core/SkData.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/include/core/SkData.h b/include/core/SkData.h index 4306208f69..546b77dccf 100644 --- a/include/core/SkData.h +++ b/include/core/SkData.h @@ -67,9 +67,6 @@ public: * effectively returning 0 == memcmp(...) */ bool equals(const SkData* other) const; -#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES - bool equals(sk_sp<const SkData>& other) const { return this->equals(other.get()); } -#endif /** * Function that, if provided, will be called when the SkData goes out @@ -160,37 +157,6 @@ public: */ static sk_sp<SkData> MakeEmpty(); -#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES - static SkData* NewWithCopy(const void* data, size_t length) { - return MakeWithCopy(data, length).release(); - } - static SkData* NewUninitialized(size_t length) { - return MakeUninitialized(length).release(); - } - static SkData* NewWithCString(const char cstr[]) { - return MakeWithCString(cstr).release(); - } - static SkData* NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context) { - return MakeWithProc(ptr, length, proc, context).release(); - } - static SkData* NewWithoutCopy(const void* data, size_t length) { - return MakeWithoutCopy(data, length).release(); - } - static SkData* NewFromMalloc(const void* data, size_t length) { - return MakeFromMalloc(data, length).release(); - } - static SkData* NewFromFileName(const char path[]) { return MakeFromFileName(path).release(); } - static SkData* NewFromFILE(FILE* f) { return MakeFromFILE(f).release(); } - static SkData* NewFromFD(int fd) { return MakeFromFD(fd).release(); } - static SkData* NewFromStream(SkStream* stream, size_t size) { - return MakeFromStream(stream, size).release(); - } - static SkData* NewSubset(const SkData* src, size_t offset, size_t length) { - return MakeSubset(src, offset, length).release(); - } - static SkData* NewEmpty() { return MakeEmpty().release(); } -#endif - private: ReleaseProc fReleaseProc; void* fReleaseProcContext; @@ -221,9 +187,4 @@ private: typedef SkRefCnt INHERITED; }; -#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES -/** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */ -typedef SkAutoTUnref<SkData> SkAutoDataUnref; -#endif - #endif |