Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android.

Review URL: https://codereview.chromium.org/12958002

git-svn-id: http://skia.googlecode.com/svn/trunk@8262 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 0 insertions, 25 deletions

diff --git a/src/images/SkImageDecoder_Factory.cpp b/src/images/SkImageDecoder_Factory.cpp
index f3cb120a47..5640e0d9df 100644
--- a/src/images/SkImageDecoder_Factory.cpp
+++ b/src/images/SkImageDecoder_Factory.cpp
@@ -18,10 +18,6 @@ typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg;
 // corner cases.
 template DecodeReg* SkTRegistry<SkImageDecoder*, SkStream*>::gHead;
 
-#ifdef SK_ENABLE_LIBPNG
-    extern SkImageDecoder* sk_libpng_dfactory(SkStream*);
-#endif
-
 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
     SkImageDecoder* codec = NULL;
     const DecodeReg* curr = DecodeReg::Head();
@@ -35,13 +31,6 @@ SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
         }
         curr = curr->next();
     }
-#ifdef SK_ENABLE_LIBPNG
-    codec = sk_libpng_dfactory(stream);
-    stream->rewind();
-    if (codec) {
-        return codec;
-    }
-#endif
     return NULL;
 }
 
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp
index 501a0d69f7..efa4595545 100644
--- a/src/images/SkImageDecoder_libpng.cpp
+++ b/src/images/SkImageDecoder_libpng.cpp
@@ -1086,11 +1086,6 @@ DEFINE_ENCODER_CREATOR(PNGImageEncoder);
 
 #include "SkTRegistry.h"
 
-#ifdef SK_ENABLE_LIBPNG
-    SkImageDecoder* sk_libpng_dfactory(SkStream*);
-    SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type);
-#endif
-
 SkImageDecoder* sk_libpng_dfactory(SkStream* stream) {
     char buf[PNG_BYTES_TO_CHECK];
     if (stream->read(buf, PNG_BYTES_TO_CHECK) == PNG_BYTES_TO_CHECK &&
diff --git a/src/images/SkImageEncoder_Factory.cpp b/src/images/SkImageEncoder_Factory.cpp
index 2bd1113f7c..10f8d64dec 100644
--- a/src/images/SkImageEncoder_Factory.cpp
+++ b/src/images/SkImageEncoder_Factory.cpp
@@ -15,10 +15,6 @@ typedef SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> EncodeReg;
 // Can't use the typedef here because of complex C++ corner cases
 template EncodeReg* SkTRegistry<SkImageEncoder*, SkImageEncoder::Type>::gHead;
 
-#ifdef SK_ENABLE_LIBPNG
-    extern SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type);
-#endif
-
 SkImageEncoder* SkImageEncoder::Create(Type t) {
     SkImageEncoder* codec = NULL;
     const EncodeReg* curr = EncodeReg::Head();
@@ -28,10 +24,5 @@ SkImageEncoder* SkImageEncoder::Create(Type t) {
         }
         curr = curr->next();
     }
-#ifdef SK_ENABLE_LIBPNG
-    if ((codec = sk_libpng_efactory(t)) != NULL) {
-        return codec;
-    }
-#endif
     return NULL;
 }