Remove image decoder and encoder autoregistration

src/images/SkImageEncoder_Factory.cpp

 
 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageEncoder.h"
 
-template SkImageEncoder_EncodeReg* SkImageEncoder_EncodeReg::gHead;
+#include "SkImageDecoder_libpng.h"
+#include "SkImageDecoder_libjpeg.h"
+#include "SkImageDecoder_libwebp.h"
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+#include "SkImageDecoder_ktx.h"
+#endif
+#if defined(SK_BUILD_FOR_WIN)
+#include "SkImageDecoder_WIC.h"
+#endif
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+#include "SkImageDecoder_CG.h"
+#endif
 
 SkImageEncoder* SkImageEncoder::Create(Type t) {
     SkImageEncoder* codec = NULL;
-    const SkImageEncoder_EncodeReg* curr = SkImageEncoder_EncodeReg::Head();
-    while (curr) {
-        if ((codec = curr->factory()(t)) != NULL) {
-            return codec;
-        }
-        curr = curr->next();
+#if defined(SK_BUILD_FOR_WIN)

[Kimmo Kinnunen, 2014/10/20 14:03:39]

I can double-check the encoder order and fix potential compile problems on
windows, mac and iOS if the approach is acceptable..

[scroggo, 2014/11/12 18:00:13]

FYI, we have compile bots for windows and mac that will run as part of the
commit queue (or you can manually run them from the reitveld issue). I don't see
one for iOS though.

I think the approach is good. I sort of hate that we need the same ifdef
conditions in two places, but I can't think of a better way.

[Kimmo Kinnunen, 2014/11/18 08:29:45]

I know, but I don't have access to run the bots manually from reitveld..
Yeah. The condition list is not that complex, though, and probably doesn't
change that often. Doing preprocessor tricks like specifying the order as a
for-each macro would be possible but probably harder to maintain with very
little benefit.

[scroggo, 2014/11/18 16:52:23]

That's annoying. Sorry, I didn't realize you couldn't do that...
Actually, I can think of a better way. Have a macro for each decoder, and then
determine whether that macro is true based on the OS:

#ifdef SK_BUILD_FOR_WIN
#define SK_BUILD_IMAGE_DECODER_WIC
#endif

(Then we could even define SK_BUILD_IMAGE_DECODER_WIC in gyp files based on the
operating system.)

+    if ((codec = SkCreateImageEncoder_WIC(t)) != NULL) {
+        return codec;
     }
+#endif
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+    if ((codec = SkCreateImageEncoder_CG(t)) != NULL) {
+        return codec;
+    }
+#endif
+#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_WIN)
+    if ((codec = SkCreatePNGImageEncoder(t)) != NULL) {
+        return codec;
+    }
+#endif
+    if ((codec = SkCreateJPEGImageEncoder(t)) != NULL) {
+        return codec;
+    }
+    if ((codec = SkCreateWEBPImageEncoder(t)) != NULL) {
+        return codec;
+    }
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+    if ((codec = SkCreateKTXImageEncoder(t)) != NULL) {
+        return codec;
+    }
+#endif
+
     return NULL;
 }