Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_libwebp.cpp

Index: src/images/SkImageDecoder_libwebp.cpp
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index 8bf15c92e6235b52751a444aac5ecf6a898f14e2..3dbe80ecfa521cb2690c542f53863a9cec639666 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
+#include "SkImageDecoder_libwebp.h"
 #include "SkColorPriv.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
@@ -664,23 +663,7 @@ bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm,
     return ok;
 }
 
-
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(WEBPImageDecoder);
-DEFINE_ENCODER_CREATOR(WEBPImageEncoder);
-///////////////////////////////////////////////////////////////////////////////
-
-static SkImageDecoder* sk_libwebp_dfactory(SkStreamRewindable* stream) {
-    int width, height, hasAlpha;
-    if (!webp_parse_header(stream, &width, &height, &hasAlpha)) {
-        return NULL;
-    }
-
-    // Magic matches, call decoder
-    return SkNEW(SkWEBPImageDecoder);
-}
-
-static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatWEBPImageDecoder(SkStreamRewindable* stream) {
     int width, height, hasAlpha;
     if (webp_parse_header(stream, &width, &height, &hasAlpha)) {
         return SkImageDecoder::kWEBP_Format;
@@ -688,10 +671,11 @@ static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
     return SkImageDecoder::kUnknown_Format;
 }
 
-static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
-      return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
+SkImageDecoder* SkCreateWEBPImageDecoder(SkImageDecoder::Format format) {
+    SkASSERT(SkImageDecoder::kWEBP_Format == format);
+    return SkNEW(SkWEBPImageDecoder);
 }
 
-static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_webp);
-static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory);
+SkImageEncoder* SkCreateWEBPImageEncoder(SkImageEncoder::Type t) {
+    return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
+}