Add SkEncodedFormat, used by SkCodec.

tools/skpdiff/SkDiffContext.cpp

Index: tools/skpdiff/SkDiffContext.cpp
diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp
index c072c27955cc3b9381fa06d93b29ce24cc19b07b..380db5dfa6298bf68bb131ccaa0e0813bee34937 100644
--- a/tools/skpdiff/SkDiffContext.cpp
+++ b/tools/skpdiff/SkDiffContext.cpp
@@ -163,7 +163,7 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) {
             SkBitmap copy;
             diffData.fResult.poiAlphaMask.copyTo(&copy, kN32_SkColorType);
             SkImageEncoder::EncodeFile(newRecord->fAlphaMaskPath.c_str(), copy,
-                                       SkImageEncoder::kPNG_Type, 100);
+                                       kPNG_SkEncodedFormat, 100);
 
             // cleanup the existing bitmap to free up resources;
             diffData.fResult.poiAlphaMask.reset();
@@ -189,7 +189,7 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) {
                                                      newRecord->fCommonName.c_str());
             SkImageEncoder::EncodeFile(newRecord->fRgbDiffPath.c_str(),
                                        diffData.fResult.rgbDiffBitmap,
-                                       SkImageEncoder::kPNG_Type, 100);
+                                       kPNG_SkEncodedFormat, 100);
             diffData.fResult.rgbDiffBitmap.reset();
             bitmapsToCreate.rgbDiff = false;
         }
@@ -202,7 +202,7 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) {
                                                        newRecord->fCommonName.c_str());
             SkImageEncoder::EncodeFile(newRecord->fWhiteDiffPath.c_str(),
                                        diffData.fResult.whiteDiffBitmap,
-                                       SkImageEncoder::kPNG_Type, 100);
+                                       kPNG_SkEncodedFormat, 100);
             diffData.fResult.whiteDiffBitmap.reset();
             bitmapsToCreate.whiteDiff = false;
         }