commit 7243f490a86ae12a87c389554904074e696c30f1
author Hal Canary <halcanary@google.com> Tue Jan 10 13:58:24 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 10 19:36:17 2017 +0000
tree e6219ae7237ba68aadd2689643265c096691bd05
parent 13ccda4847c1ec43c0015e090924cc9c3127feb9

Remove last of SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS

Approval from https://review.skia.org/5006
TBR=reed@google.com
Change-Id: Icdd54be420260ecd2f94f2f1fa76caba34e6a50e
Reviewed-on: https://skia-review.googlesource.com/6840
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

include/core/SkImageEncoder.h

diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h
index f2b0620..e4f746a 100644
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -39,16 +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 {
-        kPNG_Type     = (int)SkEncodedImageFormat::kPNG,
-    };
-    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

public.bzl

diff --git a/public.bzl b/public.bzl
index ce01b7d..a6f9333 100644
--- a/public.bzl
+++ b/public.bzl
@@ -588,7 +588,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",
     "SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",