Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_FactoryRegistrar.cpp

 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkErrorInternals.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
@@ skipping 27 matching lines @@
         if (codec) {
             return codec;
         }
         curr = curr->next();
     }
     return NULL;
 }
 
 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;
 }