Add SkEncodedFormat, used by SkCodec.

tests/KtxTest.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 "Resources.h"
 #include "SkBitmap.h"
 #include "SkData.h"
@@ skipping 34 matching lines @@
             uint8_t g = rand.nextRangeU(0, 255);
             uint8_t b = rand.nextRangeU(0, 255);
 
             SkPMColor &pixel = *(reinterpret_cast<SkPMColor*>(row + x*sizeof(SkPMColor)));
             pixel = SkPreMultiplyARGB(a, r, g, b);
         }
         row += bm8888.rowBytes();
     }
     REPORTER_ASSERT(reporter, !(bm8888.empty()));
 
-    SkAutoDataUnref encodedData(SkImageEncoder::EncodeData(bm8888, SkImageEncoder::kKTX_Type, 0));
+    SkAutoDataUnref encodedData(SkImageEncoder::EncodeData(bm8888, kKTX_SkEncodedFormat, 0));
     REPORTER_ASSERT(reporter, encodedData);
 
     SkAutoTDelete<SkMemoryStream> stream(SkNEW_ARGS(SkMemoryStream, (encodedData)));
     REPORTER_ASSERT(reporter, stream);
 
     SkBitmap decodedBitmap;
     bool imageDecodeSuccess = SkImageDecoder::DecodeStream(stream, &decodedBitmap);
     REPORTER_ASSERT(reporter, imageDecodeSuccess);
 
     REPORTER_ASSERT(reporter, decodedBitmap.colorType() == bm8888.colorType());
@@ skipping 82 matching lines @@
     if (NULL == fileData) {
         SkDebugf("KtxReexportPKM: can't load test file %s\n", pkmFilename.c_str());
         return;
     }
 
     bool installDiscardablePixelRefSuccess =
         SkInstallDiscardablePixelRef(fileData, &etcBitmap);
     REPORTER_ASSERT(reporter, installDiscardablePixelRefSuccess);
 
     // Write the bitmap out to a KTX file.
-    SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, SkImageEncoder::kKTX_Type, 0);
+    SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, kKTX_SkEncodedFormat, 0);
     SkAutoDataUnref newKtxData(ktxDataPtr);
     REPORTER_ASSERT(reporter, ktxDataPtr);
 
     // See is this data is identical to data in existing ktx file.
     SkString ktxFilename = GetResourcePath("mandrill_128.ktx");
     SkAutoDataUnref oldKtxData(SkData::NewFromFileName(ktxFilename.c_str()));
     REPORTER_ASSERT(reporter, oldKtxData->equals(newKtxData));
 }