Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libjpeg.cpp

Index: src/images/SkImageDecoder_libjpeg.cpp
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index d32e2a21c91bea0fe06e472a5e6cce22518f41c5..5fdb8e3e14c017e30ee6c780c60e55427ac1351a 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -232,8 +232,8 @@ public:
     }
 #endif
 
-    Format getFormat() const SK_OVERRIDE {
-        return kJPEG_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kJPEG_SkEncodedFormat;
     }
 
 protected:
@@ -1438,15 +1438,15 @@ static SkImageDecoder* sk_libjpeg_dfactory(SkStreamRewindable* stream) {
     return NULL;
 }
 
-static SkImageDecoder::Format get_format_jpeg(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_jpeg(SkStreamRewindable* stream) {
     if (is_jpeg(stream)) {
-        return SkImageDecoder::kJPEG_Format;
+        return kJPEG_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
-static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
+static SkImageEncoder* sk_libjpeg_efactory(SkEncodedFormat t) {
+    return (kJPEG_SkEncodedFormat == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory);