Add SkEncodedFormat, used by SkCodec.

tests/SkpSkGrTest.cpp

+#include "SkTypes.h"
+
 #if !SK_SUPPORT_GPU
 #error "GPU support required"
 #endif
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
 #include "SkGpuDevice.h"
 #include "gl/GrGLDefines.h"
 
@@ skipping 349 matching lines @@
     }
     pic->draw(canvas);
     if (scale != 1) {
         canvas->restore();
     }
 }
 
 static void writePict(const SkBitmap& bitmap, const char* outDir, const char* pngName) {
     SkString outFile = make_filepath(0, outDir, pngName);
     if (!SkImageEncoder::EncodeFile(outFile.c_str(), bitmap,
-            SkImageEncoder::kPNG_Type, 100)) {
+            kPNG_SkEncodedFormat, 100)) {
         SkDebugf("unable to encode gr %s (width=%d height=%d)br \n", pngName,
                     bitmap.width(), bitmap.height());
     }
 }
 
 void TestResult::testOne() {
     SkPicture* pic = NULL;
     {
         SkString d;
         d.printf("    {%d, \"%s\"},", fDirNo, fFilename);
@@ skipping 362 matching lines @@
     int testIndex = 166;
     int dirIndex = skipOverSkGr[testIndex - 166].directory;
     SkString pictDir = make_in_dir_name(dirIndex);
     if (pictDir.size() == 0) {
         return;
     }
     SkString filename(skipOverSkGr[testIndex - 166].filename);
     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose());
     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose());
 }