Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_ktx.cpp

Index: src/images/SkImageDecoder_ktx.cpp
diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp
index 7248950450dc60d5c5ba0c007ceb708d856c472a..59fc762de350be0adb015c1d846a3db207f29166 100644
--- a/src/images/SkImageDecoder_ktx.cpp
+++ b/src/images/SkImageDecoder_ktx.cpp
@@ -36,8 +36,8 @@ class SkKTXImageDecoder : public SkImageDecoder {
 public:
     SkKTXImageDecoder() { }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kKTX_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kKTX_SkEncodedFormat;
     }
 
 protected:
@@ -314,15 +314,15 @@ static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) {
     return NULL;
 }
 
-static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_ktx(SkStreamRewindable* stream) {
     if (SkKTXFile::is_ktx(stream)) {
-        return SkImageDecoder::kKTX_Format;
+        return kKTX_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
-SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kKTX_Type == t) ? SkNEW(SkKTXImageEncoder) : NULL;
+SkImageEncoder* sk_libktx_efactory(SkEncodedFormat t) {
+    return (kKTX_SkEncodedFormat == t) ? SkNEW(SkKTXImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory);