Remove image decoder and encoder autoregistration

src/ports/SkImageDecoder_WIC.cpp

Index: src/ports/SkImageDecoder_WIC.cpp
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index 0c109a276d8165b01d9ca4a4856af6311c7f71a0..753fc83c57549ad41b777d4fcfdb1e3e699b6ddf 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -6,8 +6,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkTypes.h"
-
+#include "SkImageDecoder_WIC.h"
 // Workaround for:
 // http://connect.microsoft.com/VisualStudio/feedback/details/621653/
 // http://crbug.com/225822
@@ -29,10 +28,7 @@
 
 #include <wincodec.h>
 #include "SkAutoCoInitialize.h"
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
 #include "SkIStream.h"
-#include "SkMovie.h"
 #include "SkStream.h"
 #include "SkTScopedComPtr.h"
 #include "SkUnPreMultiply.h"
@@ -250,22 +246,9 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
 
 /////////////////////////////////////////////////////////////////////////
 
-extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
-
-SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
-    SkImageDecoder* decoder = image_decoder_from_stream(stream);
-    if (NULL == decoder) {
-        // If no image decoder specific to the stream exists, use SkImageDecoder_WIC.
-        return SkNEW(SkImageDecoder_WIC);
-    } else {
-        return decoder;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////
-
-SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
-    return NULL;
+SkImageDecoder* SkCreateImageDecoder_WIC(SkImageDecoder::Format format) {
+    SkASSERT(SkImageDecoder::kUnknown_Format != format);
+    return SkNEW(SkImageDecoder_WIC);
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -437,7 +420,7 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
+SkImageEncoder* SkCreateImageEncoder_WIC(SkImageEncoder::Type t) {
     switch (t) {
         case SkImageEncoder::kBMP_Type:
         case SkImageEncoder::kICO_Type:
@@ -450,9 +433,7 @@ static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
     return SkNEW_ARGS(SkImageEncoder_WIC, (t));
 }
 
-static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
-
-static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatImageDecoder_WIC(SkStreamRewindable* stream) {
     SkImageDecoder::Format format;
     SkImageDecoder_WIC codec;
     if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
@@ -460,5 +441,3 @@ static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
     }
     return format;
 }
-
-static SkImageDecoder_FormatReg gFormatReg(get_format_wic);