Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_ktx.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 "SkPixelRef.h"
@@ skipping 18 matching lines @@
 //
 // This decoder is meant to be used with an SkDiscardablePixelRef so that GPU backends
 // can sniff the data before creating a texture. If they encounter a compressed format
 // that they understand, they can then upload the data directly to the GPU. Otherwise,
 // they will decode the data into a format that Skia supports.
 
 class SkKTXImageDecoder : public SkImageDecoder {
 public:
     SkKTXImageDecoder() { }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kKTX_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kKTX_SkEncodedFormat;
     }
 
 protected:
     Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
 SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
@@ skipping 256 matching lines @@
 DEFINE_ENCODER_CREATOR(KTXImageEncoder);
 /////////////////////////////////////////////////////////////////////////////////////////
 
 static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) {
     if (SkKTXFile::is_ktx(stream)) {
         return SkNEW(SkKTXImageDecoder);
     }
     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);
 static SkImageDecoder_FormatReg gFormatReg(get_format_ktx);
 static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory);