Add SkEncodedFormat, used by SkCodec.

tests/BlitRowTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 162 matching lines @@
     }
 
     void draw(SkCanvas* canvas, SkPaint* paint) {
         canvas->drawVertices(SkCanvas::kTriangleFan_VertexMode, 4, fPts, fPts,
                              NULL, NULL, NULL, 0, *paint);
     }
 };
 
 #include "SkImageEncoder.h"
 static void save_bm(const SkBitmap& bm, const char name[]) {
-    SkImageEncoder::EncodeFile(name, bm, SkImageEncoder::kPNG_Type, 100);
+    SkImageEncoder::EncodeFile(name, bm, kPNG_SkEncodedFormat, 100);
 }
 
 static bool gOnce;
 
 // Make sure our blits are invariant with the width of the blit (i.e. that
 // special case for 8 at a time have the same results as narrower blits)
 static void test_diagonal(skiatest::Reporter* reporter) {
     static const int W = 64;
     static const int H = W;
 
@@ skipping 61 matching lines @@
                 }
             }
         }
     }
 }
 
 DEF_TEST(BlitRow, reporter) {
     test_00_FF(reporter);
     test_diagonal(reporter);
 }