Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_FactoryRegistrar.cpp

Index: src/images/SkImageDecoder_FactoryRegistrar.cpp
diff --git a/src/images/SkImageDecoder_FactoryRegistrar.cpp b/src/images/SkImageDecoder_FactoryRegistrar.cpp
index b47a6d5317dca15c71d83edcfe367363f9c4bdef..66eb0b141af280284d51919589dd03dbafc645b0 100644
--- a/src/images/SkImageDecoder_FactoryRegistrar.cpp
+++ b/src/images/SkImageDecoder_FactoryRegistrar.cpp
@@ -45,19 +45,19 @@ SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) {
 
 template SkImageDecoder_FormatReg* SkImageDecoder_FormatReg::gHead;
 
-SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStreamRewindable* stream) {
+SkEncodedFormat SkImageDecoder::GetStreamFormat(SkStreamRewindable* stream) {
     const SkImageDecoder_FormatReg* curr = SkImageDecoder_FormatReg::Head();
     while (curr != NULL) {
-        Format format = curr->factory()(stream);
+        SkEncodedFormat format = curr->factory()(stream);
         if (!stream->rewind()) {
             SkErrorInternals::SetError(kInvalidOperation_SkError,
                                        "Unable to rewind the image stream\n");
-            return kUnknown_Format;
+            return kUnknown_SkEncodedFormat;
         }
-        if (format != kUnknown_Format) {
+        if (format != kUnknown_SkEncodedFormat) {
             return format;
         }
         curr = curr->next();
     }
-    return kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }