Delete SkImage::encode(Type)

This doesn't appear to be used (fingers crossed).

We're not ready to support color correct encodes (and tagging with
color spaces) for all of the formats included in SkImageEncoder::Type.

I think it's good to restrict this for now.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4535

Change-Id: I73000f3d7bff1af153786d766531a2cbc8c5b77a
Reviewed-on: https://skia-review.googlesource.com/4535
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/gm/image.cpp b/gm/image.cpp
index 5454ac3966..8933cc9907 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -348,13 +348,16 @@ static SkImageGenerator* gen_picture(const SkImageInfo& info) {
 
 static SkImageGenerator* gen_png(const SkImageInfo& info) {
     sk_sp<SkImage> image(make_raster(info, nullptr, draw_opaque_contents));
-    sk_sp<SkData> data(image->encode(SkImageEncoder::kPNG_Type, 100));
+    sk_sp<SkData> data(image->encode());
     return SkImageGenerator::NewFromEncoded(data.get());
 }
 
 static SkImageGenerator* gen_jpg(const SkImageInfo& info) {
     sk_sp<SkImage> image(make_raster(info, nullptr, draw_opaque_contents));
-    sk_sp<SkData> data(image->encode(SkImageEncoder::kJPEG_Type, 100));
+    SkBitmap bitmap;
+    SkAssertResult(image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode));
+    sk_sp<SkData> data =
+            sk_ref_sp(SkImageEncoder::EncodeData(bitmap, SkImageEncoder::kJPEG_Type, 100));
     return SkImageGenerator::NewFromEncoded(data.get());
 }
 
diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp
index 924199e6e7..0c37175508 100644
--- a/gm/image_shader.cpp
+++ b/gm/image_shader.cpp
@@ -55,7 +55,7 @@ static sk_sp<SkImage> make_encode_gen(GrContext* ctx, SkPicture* pic, const SkIm
     if (!src) {
         return nullptr;
     }
-    sk_sp<SkData> encoded(src->encode(SkImageEncoder::kPNG_Type, 100));
+    sk_sp<SkData> encoded(src->encode());
     if (!encoded) {
         return nullptr;
     }