SkImageEncoder::* going away
Approval from https://review.skia.org/5006
TBR=reed@google.com
Change-Id: Ib5fb1b624594598e2316f9247069ecd207d7a974
Reviewed-on: https://skia-review.googlesource.com/5751
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni
index 7ffd36d..3447efe 100644
--- a/gn/android_framework_defines.gni
+++ b/gn/android_framework_defines.gni
@@ -12,7 +12,6 @@
"SK_SUPPORT_LEGACY_GRADIENT_DITHERING",
"SK_SUPPORT_LEGACY_DRAWFILTER",
"SK_IGNORE_GPU_DITHER",
- "SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS",
"SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
"SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
]
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 625d0a0..8c73eeb 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -276,11 +276,6 @@
* even if the image returns a data from refEncoded(). That data will be ignored.
*/
SkData* encode(SkEncodedImageFormat, int quality) const;
-#ifdef SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS
- SkData* encode(SkImageEncoder::Type t, int quality) const {
- return this->encode((SkEncodedImageFormat)t, quality);
- }
-#endif
/**
* Encode the image and return the result as a caller-managed SkData. This will
diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h
index 17d0603..e4f746a 100644
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -39,36 +39,4 @@
return src.peekPixels(&pixmap) && SkEncodeImage(dst, pixmap, f, q);
}
-//TODO(halcanary): remove this code once all changes land.
-#ifdef SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS
-class SkImageEncoder {
-public:
- enum Type {
-#ifdef GOOGLE3
- kUnknown_Type = (int)SkEncodedImageFormat::kUnknown,
-#endif
- kBMP_Type = (int)SkEncodedImageFormat::kBMP,
- kGIF_Type = (int)SkEncodedImageFormat::kGIF,
- kICO_Type = (int)SkEncodedImageFormat::kICO,
- kJPEG_Type = (int)SkEncodedImageFormat::kJPEG,
- kPNG_Type = (int)SkEncodedImageFormat::kPNG,
- kWBMP_Type = (int)SkEncodedImageFormat::kWBMP,
- kWEBP_Type = (int)SkEncodedImageFormat::kWEBP,
- kKTX_Type = (int)SkEncodedImageFormat::kKTX,
- };
- static SkData* EncodeData(const SkBitmap& src, Type t, int quality) {
- SkDynamicMemoryWStream buf;
- return SkEncodeImage(&buf, src, (SkEncodedImageFormat)t, quality)
- ? buf.detachAsData().release() : nullptr;
- }
- static bool EncodeFile(const char path[], const SkBitmap& src, Type t, int quality) {
- SkFILEWStream file(path);
- return SkEncodeImage(&file, src, (SkEncodedImageFormat)t, quality);
- }
- static bool EncodeStream(SkWStream* dst, const SkBitmap& bm, Type t, int quality) {
- return SkEncodeImage(dst, bm, (SkEncodedImageFormat)t, quality);
- }
-};
-#endif // SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS
-
#endif // SkImageEncoder_DEFINED
diff --git a/include/images/SkForceLinking.h b/include/images/SkForceLinking.h
deleted file mode 100644
index ca52eeb..0000000
--- a/include/images/SkForceLinking.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(halcanary): delete this file.
diff --git a/public.bzl b/public.bzl
index e17352b..8bebd19 100644
--- a/public.bzl
+++ b/public.bzl
@@ -590,7 +590,6 @@
# Turn on a few Google3-specific build fixes.
"GOOGLE3",
# Staging flags for API changes
- "SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS",
# Temporarily Disable analytic AA for Google3
"SK_NO_ANALYTIC_AA",
]