Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_libwebp.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
+#include "SkImageDecoder_libwebp.h"
+
 #include "SkColorPriv.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 
 // A WebP decoder only, on top of (subset of) libwebp
 // For more information on WebP image format, and libwebp library, see:
 //   http://code.google.com/speed/webp/
 //   http://www.webmproject.org/code/#libwebp_webp_image_decoder_library
@@ skipping 553 matching lines @@
             return NULL;
     }
 }
 
 static int stream_writer(const uint8_t* data, size_t data_size,
                          const WebPPicture* const picture) {
   SkWStream* const stream = (SkWStream*)picture->custom_ptr;
   return stream->write(data, data_size) ? 1 : 0;
 }
 
+SkImageDecoder::Format SkDetectFormatWEBPImageDecoder(SkStreamRewindable* stream) {
+    int width, height, hasAlpha;
+    if (webp_parse_header(stream, &width, &height, &hasAlpha)) {
+        return SkImageDecoder::kWEBP_Format;
+    }
+    return SkImageDecoder::kUnknown_Format;
+}
+
+SkImageDecoder* SkCreateWEBPImageDecoder(SkStreamRewindable* stream) {
+    if (SkDetectFormatWEBPImageDecoder(stream) == SkImageDecoder::kWEBP_Format) {
+        return SkNEW(SkWEBPImageDecoder);
+    }
+    return NULL;
+}
+
 class SkWEBPImageEncoder : public SkImageEncoder {
 protected:
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE;
 
 private:
     typedef SkImageEncoder INHERITED;
 };
 
 bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm,
                                   int quality) {
@@ skipping 44 matching lines @@
         ok = SkToBool(WebPPictureImportRGBA(&pic, rgb, rgbStride));
     }
     delete[] rgb;
 
     ok = ok && WebPEncode(&webp_config, &pic);
     WebPPictureFree(&pic);
 
     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);
+SkImageEncoder* SkCreateWEBPImageEncoder(SkImageEncoder::Type t) {
+    return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
 }
-
-static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
-    int width, height, hasAlpha;
-    if (webp_parse_header(stream, &width, &height, &hasAlpha)) {
-        return SkImageDecoder::kWEBP_Format;
-    }
-    return SkImageDecoder::kUnknown_Format;
-}
-
-static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
-      return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
-}
-
-static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_webp);
-static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory);