Clean up unused SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS code

Approval from https://review.skia.org/5006
TBR=reed@google.com

Change-Id: Ie630a3f45a830c8c2dc80a30e759d9481b8d60a5
Reviewed-on: https://skia-review.googlesource.com/5775
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 f9b4c87..b693d28 100644 (file)
--- a/gn/android_framework_defines.gni
+++ b/gn/android_framework_defines.gni
@@ -13,7 +13,6 @@ android_framework_defines = [
   "SK_SUPPORT_LEGACY_DRAWFILTER",
   "SK_IGNORE_GPU_DITHER",
   "SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",
-  "SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS",
   "SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
   "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
   "SK_SUPPORT_EXOTIC_CLIPOPS",

diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 9ecfb27..076da33 100644 (file)
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -280,11 +280,6 @@ public:
      *  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..f2b0620 100644 (file)
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -44,31 +44,11 @@ inline bool SkEncodeImage(SkWStream* dst, const SkBitmap& src, SkEncodedImageFor
 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 (file)
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.