Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libpng.cpp

Index: src/images/SkImageDecoder_libpng.cpp
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp
index 245654dbfd3dbcb3c735b1f8ccdb44fe26433a8a..76ecbecea2ddac27b64bd52ec5bfe488322bc283 100644
--- a/src/images/SkImageDecoder_libpng.cpp
+++ b/src/images/SkImageDecoder_libpng.cpp
@@ -78,8 +78,8 @@ public:
     SkPNGImageDecoder() {
         fImageIndex = NULL;
     }
-    Format getFormat() const SK_OVERRIDE {
-        return kPNG_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kPNG_SkEncodedFormat;
     }
 
     virtual ~SkPNGImageDecoder() {
@@ -1273,15 +1273,15 @@ SkImageDecoder* sk_libpng_dfactory(SkStreamRewindable* stream) {
     return NULL;
 }
 
-static SkImageDecoder::Format get_format_png(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_png(SkStreamRewindable* stream) {
     if (is_png(stream)) {
-        return SkImageDecoder::kPNG_Format;
+        return kPNG_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
-SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;
+SkImageEncoder* sk_libpng_efactory(SkEncodedFormat t) {
+    return (kPNG_SkEncodedFormat == t) ? SkNEW(SkPNGImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libpng_dfactory);