Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_pkm.cpp

Index: src/images/SkImageDecoder_pkm.cpp
diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp
index c607c6f8526eb5bf53f756c682ed2bc322713bec..b037a18fb3ff7276d3b8c265c355623952098bce 100644
--- a/src/images/SkImageDecoder_pkm.cpp
+++ b/src/images/SkImageDecoder_pkm.cpp
@@ -19,8 +19,8 @@ class SkPKMImageDecoder : public SkImageDecoder {
 public:
     SkPKMImageDecoder() { }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kPKM_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kPKM_SkEncodedFormat;
     }
 
 protected:
@@ -118,11 +118,11 @@ static SkImageDecoder* sk_libpkm_dfactory(SkStreamRewindable* stream) {
 
 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory);
 
-static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_pkm(SkStreamRewindable* stream) {
     if (is_pkm(stream)) {
-        return SkImageDecoder::kPKM_Format;
+        return kPKM_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_pkm);