Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder.cpp

Index: src/images/SkImageDecoder.cpp
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 5b3cf325455f9fe3791893f65b4bf1bebdd52ef7..3dbffd53c81de78577b5d37517b61fa964267c28 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -45,37 +45,37 @@ void SkImageDecoder::copyFieldsToOther(SkImageDecoder* other) {
     other->setRequireUnpremultipliedColors(fRequireUnpremultipliedColors);
 }
 
-SkImageDecoder::Format SkImageDecoder::getFormat() const {
-    return kUnknown_Format;
+SkEncodedFormat SkImageDecoder::getFormat() const {
+    return kUnknown_SkEncodedFormat;
 }
 
 const char* SkImageDecoder::getFormatName() const {
     return GetFormatName(this->getFormat());
 }
 
-const char* SkImageDecoder::GetFormatName(Format format) {
+const char* SkImageDecoder::GetFormatName(SkEncodedFormat format) {
     switch (format) {
-        case kUnknown_Format:
-            return "Unknown Format";
-        case kBMP_Format:
+        case kUnknown_SkEncodedFormat:
+            return "Unknown SkEncodedFormat";
+        case kBMP_SkEncodedFormat:
             return "BMP";
-        case kGIF_Format:
+        case kGIF_SkEncodedFormat:
             return "GIF";
-        case kICO_Format:
+        case kICO_SkEncodedFormat:
             return "ICO";
-        case kPKM_Format:
+        case kPKM_SkEncodedFormat:
             return "PKM";
-        case kKTX_Format:
+        case kKTX_SkEncodedFormat:
             return "KTX";
-        case kASTC_Format:
+        case kASTC_SkEncodedFormat:
             return "ASTC";
-        case kJPEG_Format:
+        case kJPEG_SkEncodedFormat:
             return "JPEG";
-        case kPNG_Format:
+        case kPNG_SkEncodedFormat:
             return "PNG";
-        case kWBMP_Format:
+        case kWBMP_SkEncodedFormat:
             return "WBMP";
-        case kWEBP_Format:
+        case kWEBP_SkEncodedFormat:
             return "WEBP";
         default:
             SkDEBUGFAIL("Invalid format type!");
@@ -215,7 +215,7 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkImageDecoder::DecodeFile(const char file[], SkBitmap* bm, SkColorType pref,  Mode mode,
-                                Format* format) {
+                                SkEncodedFormat* format) {
     SkASSERT(file);
     SkASSERT(bm);
 
@@ -232,7 +232,7 @@ bool SkImageDecoder::DecodeFile(const char file[], SkBitmap* bm, SkColorType pre
 }
 
 bool SkImageDecoder::DecodeMemory(const void* buffer, size_t size, SkBitmap* bm, SkColorType pref,
-                                  Mode mode, Format* format) {
+                                  Mode mode, SkEncodedFormat* format) {
     if (0 == size) {
         return false;
     }
@@ -243,7 +243,7 @@ bool SkImageDecoder::DecodeMemory(const void* buffer, size_t size, SkBitmap* bm,
 }
 
 bool SkImageDecoder::DecodeStream(SkStreamRewindable* stream, SkBitmap* bm, SkColorType pref,
-                                  Mode mode, Format* format) {
+                                  Mode mode, SkEncodedFormat* format) {
     SkASSERT(stream);
     SkASSERT(bm);
 
@@ -254,7 +254,7 @@ bool SkImageDecoder::DecodeStream(SkStreamRewindable* stream, SkBitmap* bm, SkCo
         success = codec->decode(stream, bm, pref, mode) != kFailure;
         if (success && format) {
             *format = codec->getFormat();
-            if (kUnknown_Format == *format) {
+            if (kUnknown_SkEncodedFormat == *format) {
                 if (stream->rewind()) {
                     *format = GetStreamFormat(stream);
                 }