Remove image decoder and encoder autoregistration

include/core/SkImageEncoder.h

Index: include/core/SkImageEncoder.h
diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h
index 0a850fcdcb47b545c5dbd28f66aaf6b06663c9c5..de7acf7918acf8e79462113dc036f132d05a8bee 100644
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -87,35 +87,4 @@ protected:
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) = 0;
 };
 
-// This macro declares a global (i.e., non-class owned) creation entry point
-// for each encoder (e.g., CreateJPEGImageEncoder)
-#define DECLARE_ENCODER_CREATOR(codec)          \
-    SkImageEncoder *Create ## codec ();
-
-// This macro defines the global creation entry point for each encoder. Each
-// encoder implementation that registers with the encoder factory must call it.
-#define DEFINE_ENCODER_CREATOR(codec)           \
-    SkImageEncoder *Create ## codec () {        \
-        return SkNEW( Sk ## codec );            \
-    }
-
-// All the encoders known by Skia. Note that, depending on the compiler settings,
-// not all of these will be available
-/** An ARGBImageEncoder will always write out
- *  bitmap.width() * bitmap.height() * 4
- *  bytes.
- */
-DECLARE_ENCODER_CREATOR(ARGBImageEncoder);
-DECLARE_ENCODER_CREATOR(JPEGImageEncoder);
-DECLARE_ENCODER_CREATOR(PNGImageEncoder);
-DECLARE_ENCODER_CREATOR(KTXImageEncoder);
-DECLARE_ENCODER_CREATOR(WEBPImageEncoder);
-
-#ifdef SK_BUILD_FOR_IOS
-DECLARE_ENCODER_CREATOR(PNGImageEncoder_IOS);
-#endif
-
-// Typedef to make registering encoder callback easier
-// This has to be defined outside SkImageEncoder. :(
-typedef SkTRegistry<SkImageEncoder*(*)(SkImageEncoder::Type)> SkImageEncoder_EncodeReg;
 #endif