Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libgif.cpp

Index: src/images/SkImageDecoder_libgif.cpp
diff --git a/src/images/SkImageDecoder_libgif.cpp b/src/images/SkImageDecoder_libgif.cpp
index b0ed81037302aff2c4d1c1debbe5a33318490faa..3b6ba805c1345ac6f8f30020277d1847d52933a0 100644
--- a/src/images/SkImageDecoder_libgif.cpp
+++ b/src/images/SkImageDecoder_libgif.cpp
@@ -19,8 +19,8 @@
 
 class SkGIFImageDecoder : public SkImageDecoder {
 public:
-    Format getFormat() const SK_OVERRIDE {
-        return kGIF_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kGIF_SkEncodedFormat;
     }
 
 protected:
@@ -531,11 +531,11 @@ static SkImageDecoder* sk_libgif_dfactory(SkStreamRewindable* stream) {
 
 static SkImageDecoder_DecodeReg gReg(sk_libgif_dfactory);
 
-static SkImageDecoder::Format get_format_gif(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_gif(SkStreamRewindable* stream) {
     if (is_gif(stream)) {
-        return SkImageDecoder::kGIF_Format;
+        return kGIF_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_gif);