diff options
author | Mike Reed <reed@google.com> | 2016-10-31 15:11:04 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-31 19:35:15 +0000 |
commit | 09d9435835f48b06954904f16d14c1c2eeaaad2e (patch) | |
tree | 717ad84a3204cdb81646e0d9dee23977965ce2e5 /src/core/SkPicture.cpp | |
parent | fc49b403eb3353fdefe97672017df10b64dee95a (diff) |
remove lots of legacy flags
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4209
Change-Id: I49ae36a9b2bb51a6470638d3264923ff4a4dea0a
Reviewed-on: https://skia-review.googlesource.com/4209
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkPicture.cpp')
-rw-r--r-- | src/core/SkPicture.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 88da70aacf..ae3b70452e 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -24,31 +24,6 @@ static bool g_AllPictureIOSecurityPrecautionsEnabled = false; DECLARE_SKMESSAGEBUS_MESSAGE(SkPicture::DeletionMessage); -#ifdef SK_SUPPORT_LEGACY_PICTUREINSTALLPIXELREF -class InstallProcImageDeserializer : public SkImageDeserializer { - SkPicture::InstallPixelRefProc fProc; -public: - InstallProcImageDeserializer(SkPicture::InstallPixelRefProc proc) : fProc(proc) {} - - sk_sp<SkImage> makeFromMemory(const void* data, size_t length, const SkIRect* subset) override { - SkBitmap bitmap; - if (fProc(data, length, &bitmap)) { - bitmap.setImmutable(); - return SkImage::MakeFromBitmap(bitmap); - } - return nullptr; - } - sk_sp<SkImage> makeFromData(SkData* data, const SkIRect* subset) override { - return this->makeFromMemory(data->data(), data->size(), subset); - } -}; - -sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, InstallPixelRefProc proc) { - InstallProcImageDeserializer deserializer(proc); - return MakeFromStream(stream, &deserializer); -} -#endif - /* SkPicture impl. This handles generic responsibilities like unique IDs and serialization. */ SkPicture::SkPicture() : fUniqueID(0) {} |