Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_astc.cpp

Index: src/images/SkImageDecoder_astc.cpp
diff --git a/src/images/SkImageDecoder_astc.cpp b/src/images/SkImageDecoder_astc.cpp
index 64cdf43e5de7909145cff8deea260de55cee2b6f..1acafb37eff6af44b57cecf2de41d9c15c8fd515 100644
--- a/src/images/SkImageDecoder_astc.cpp
+++ b/src/images/SkImageDecoder_astc.cpp
@@ -19,8 +19,8 @@ class SkASTCImageDecoder : public SkImageDecoder {
 public:
     SkASTCImageDecoder() { }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kASTC_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kASTC_SkEncodedFormat;
     }
 
 protected:
@@ -193,11 +193,11 @@ static SkImageDecoder* sk_libastc_dfactory(SkStreamRewindable* stream) {
 
 static SkImageDecoder_DecodeReg gReg(sk_libastc_dfactory);
 
-static SkImageDecoder::Format get_format_astc(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_astc(SkStreamRewindable* stream) {
     if (is_astc(stream)) {
-        return SkImageDecoder::kASTC_Format;
+        return kASTC_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_astc);