diff --git a/include/utils/SkBase64.h b/include/utils/SkBase64.h index 55baa1bbc0..ed76638b6d 100644 --- a/include/utils/SkBase64.h +++ b/include/utils/SkBase64.h @@ -18,15 +18,6 @@ public: kBadCharError }; - /** @deprecated */ - SkBase64(); - /** @deprecated, required user to `delete skbase64.getData()` */ - Error decode(const char* src, size_t length); - /** @deprecated */ - char* getData() { return fData; } - /** @deprecated */ - size_t getDataSize() { return fLength; } - /** Base64 encodes src into dst. @@ -55,12 +46,6 @@ public: */ static Error SK_WARN_UNUSED_RESULT Decode(const void* src, size_t srcLength, void* dst, size_t* dstLength); - -private: - /** @deprecated */ - size_t fLength; - /** @deprecated */ - char* fData; }; #endif // SkBase64_DEFINED diff --git a/src/utils/SkBase64.cpp b/src/utils/SkBase64.cpp index 13220347cd..e218dd7a43 100644 --- a/src/utils/SkBase64.cpp +++ b/src/utils/SkBase64.cpp @@ -150,16 +150,3 @@ size_t SkBase64::Encode(const void* srcv, size_t length, void* dstv, const char* } return (length + 2) / 3 * 4; } - -/** @deprecated */ -SkBase64::SkBase64() : fLength((size_t) -1), fData(nullptr) {} - -/** @deprecated */ -SkBase64::Error SkBase64::decode(const char* src, size_t len) { - Error err = SkBase64::Decode(src, len, nullptr, &fLength); - if (err != kNoError) { - return err; - } - fData = new char[fLength]; - return SkBase64::Decode(src, len, fData, &fLength); -}