From 92ed61e624801d2a7a877ee843cb1a6395f5b41e Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 18 Jul 2017 20:44:57 +0000 Subject: Revert "Revert "remove dead code for legacy image encode api"" This reverts commit 1e0779ba1120182c03f5d52a66df043d70efc376. Reason for revert: Flutter and Fuchsia have both been switched to new API! Original change's description: > Revert "remove dead code for legacy image encode api" > > This reverts commit 41ed7f33792c4c32b8444230b8b59cab5e29e45e. > > Reason for revert: Need this in temporarily to navigate Flutter and Fuchsia rolls. > > Original change's description: > > remove dead code for legacy image encode api > > > > Bug: skia: > > Change-Id: Ia90d776946281473c56cd93006df1b523475696a > > Reviewed-on: https://skia-review.googlesource.com/23022 > > Reviewed-by: Leon Scroggins > > Commit-Queue: Mike Reed > > TBR=scroggo@google.com,reed@google.com > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: skia: > Change-Id: I078762fc13de0c455dc6f8a5725d9529af03bffc > Reviewed-on: https://skia-review.googlesource.com/23385 > Reviewed-by: Brian Osman > Commit-Queue: Brian Osman TBR=scroggo@google.com,brianosman@google.com,reed@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: I2b45facf21a97d01a81c7f311252d2f45eb1f61e Reviewed-on: https://skia-review.googlesource.com/24281 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- src/image/SkImage.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src') diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 8cb526746c..841e83cc2b 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -138,21 +138,6 @@ sk_sp SkImage::MakeFromEncoded(sk_sp encoded, const SkIRect* su return SkImage::MakeFromGenerator(SkImageGenerator::MakeFromEncoded(encoded), subset); } -#ifdef SK_SUPPORT_LEGACY_IMAGE_ENCODE_API -SkData* SkImage::encode(SkEncodedImageFormat format, int quality) const { - return this->encodeToData(format, quality).release(); -} -SkData* SkImage::encode(SkPixelSerializer* serial) const { - return this->encodeToData(serial).release(); -} -SkData* SkImage::refEncoded() const { - return this->refEncodedData().release(); -} -SkData* SkPixelSerializer::encode(const SkPixmap& pixmap) { - return this->encodeToData(pixmap).release(); -} -#endif - /////////////////////////////////////////////////////////////////////////////////////////////////// const char* SkImage::toString(SkString* str) const { -- cgit v1.2.3