Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_pkm.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTextureCompressor.h"
 #include "SkTypes.h"
 
 #include "etc1.h"
 
 class SkPKMImageDecoder : public SkImageDecoder {
 public:
     SkPKMImageDecoder() { }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kPKM_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kPKM_SkEncodedFormat;
     }
 
 protected:
     Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ skipping 77 matching lines @@
 
 static SkImageDecoder* sk_libpkm_dfactory(SkStreamRewindable* stream) {
     if (is_pkm(stream)) {
         return SkNEW(SkPKMImageDecoder);
     }
     return NULL;
 }
 
 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);