Add test for platform encoders, turn off platform encoders by default

Clients that like WIC and CG can still use them.  And we can be
confident about that, since we now test WIC and CG.

Let Skia always use our own encoders by default, so we can do cool,
custom things on all platforms.

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

Review-Url: https://codereview.chromium.org/2250683003

1 files changed, 5 insertions, 13 deletions

diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp
index 9be95727ca..6524526bdb 100644
--- a/src/ports/SkImageEncoder_WIC.cpp
+++ b/src/ports/SkImageEncoder_WIC.cpp
@@ -50,10 +50,6 @@ class SkImageEncoder_WIC : public SkImageEncoder {
 public:
     SkImageEncoder_WIC(Type t) : fType(t) {}
 
-    // DO NOT USE this constructor.  This exists only so SkForceLinking can
-    // link the WIC image encoder.
-    SkImageEncoder_WIC() {}
-
 protected:
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality);
 
@@ -67,12 +63,6 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
 {
     GUID type;
     switch (fType) {
-        case kBMP_Type:
-            type = GUID_ContainerFormatBmp;
-            break;
-        case kICO_Type:
-            type = GUID_ContainerFormatIco;
-            break;
         case kJPEG_Type:
             type = GUID_ContainerFormatJpeg;
             break;
@@ -228,10 +218,9 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef SK_USE_WIC_ENCODER
 static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
     switch (t) {
-        case SkImageEncoder::kBMP_Type:
-        case SkImageEncoder::kICO_Type:
         case SkImageEncoder::kPNG_Type:
         case SkImageEncoder::kJPEG_Type:
             break;
@@ -242,7 +231,10 @@ static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
 }
 
 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
+#endif
 
-DEFINE_ENCODER_CREATOR(ImageEncoder_WIC);
+SkImageEncoder* CreateImageEncoder_WIC(SkImageEncoder::Type type) {
+    return new SkImageEncoder_WIC(type);
+}
 
 #endif // defined(SK_BUILD_FOR_WIN32)