Add SkEncodedFormat, used by SkCodec.

tests/CachedDecodingPixelRefTest.cpp

 /*
  * Copyright 2013 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 "SkCachingPixelRef.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDiscardableMemoryPool.h"
+#include "SkEncodedFormat.h"
 #include "SkImageDecoder.h"
 #include "SkImageGeneratorPriv.h"
 #include "SkResourceCache.h"
 #include "SkStream.h"
 #include "SkUtils.h"
 
 #include "Test.h"
 
 /**
  * Fill this bitmap with some color.
  */
 static void make_test_image(SkBitmap* bm) {
     const int W = 50, H = 50;
     bm->allocN32Pixels(W, H);
     bm->eraseColor(SK_ColorBLACK);
     SkCanvas canvas(*bm);
     SkPaint paint;
     paint.setColor(SK_ColorBLUE);
     canvas.drawRectCoords(0, 0, SkIntToScalar(W/2),
                           SkIntToScalar(H/2), paint);
     paint.setColor(SK_ColorWHITE);
     canvas.drawRectCoords(SkIntToScalar(W/2), SkIntToScalar(H/2),
                           SkIntToScalar(W), SkIntToScalar(H), paint);
 }
 
 /**
  * encode this bitmap into some data via SkImageEncoder
  */
 static SkData* create_data_from_bitmap(const SkBitmap& bm,
-                                       SkImageEncoder::Type type) {
+                                       SkEncodedFormat type) {
     SkDynamicMemoryWStream stream;
     if (SkImageEncoder::EncodeStream(&stream, bm, type, 100)) {
         return stream.copyToData();
     }
     return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 static void compare_bitmaps(skiatest::Reporter* reporter,
@@ skipping 40 matching lines @@
    original bitmap */
 static void test_three_encodings(skiatest::Reporter* reporter,
                                  InstallEncoded install) {
     SkBitmap original;
     make_test_image(&original);
     REPORTER_ASSERT(reporter, !original.empty());
     REPORTER_ASSERT(reporter, !original.isNull());
     if (original.empty() || original.isNull()) {
         return;
     }
-    static const SkImageEncoder::Type types[] = {
-        SkImageEncoder::kPNG_Type,
-        SkImageEncoder::kJPEG_Type,
-        SkImageEncoder::kWEBP_Type
+    static const SkEncodedFormat types[] = {
+        kJPEG_SkEncodedFormat,
+        kPNG_SkEncodedFormat,
+        kWEBP_SkEncodedFormat,
     };
     for (size_t i = 0; i < SK_ARRAY_COUNT(types); i++) {
-        SkImageEncoder::Type type = types[i];
+        SkEncodedFormat type = types[i];
         SkAutoDataUnref encoded(create_data_from_bitmap(original, type));
         REPORTER_ASSERT(reporter, encoded.get() != NULL);
         if (NULL == encoded.get()) {
             continue;
         }
         SkBitmap lazy;
         bool installSuccess = install(encoded.get(), &lazy);
         REPORTER_ASSERT(reporter, installSuccess);
         if (!installSuccess) {
             continue;
         }
         REPORTER_ASSERT(reporter, NULL == lazy.getPixels());
         {
             SkAutoLockPixels autoLockPixels(lazy);  // now pixels are good.
             REPORTER_ASSERT(reporter, lazy.getPixels());
             if (NULL == lazy.getPixels()) {
                 continue;
             }
         }
         // pixels should be gone!
         REPORTER_ASSERT(reporter, NULL == lazy.getPixels());
         {
             SkAutoLockPixels autoLockPixels(lazy);  // now pixels are good.
             REPORTER_ASSERT(reporter, lazy.getPixels());
             if (NULL == lazy.getPixels()) {
                 continue;
             }
         }
-        bool comparePixels = (SkImageEncoder::kPNG_Type == type);
+        bool comparePixels = (kPNG_SkEncodedFormat == type);
         compare_bitmaps(reporter, original, lazy, comparePixels);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 static bool install_skCachingPixelRef(SkData* encoded, SkBitmap* dst) {
     return SkCachingPixelRef::Install(SkImageGenerator::NewFromData(encoded), dst);
 }
 static bool install_skDiscardablePixelRef(SkData* encoded, SkBitmap* dst) {
     // Use system-default discardable memory.
@@ skipping 199 matching lines @@
         canvas.clear(kDefaultColor);
         canvas.drawImage(image, 0, 0, NULL);
         if (TestImageGenerator::kSucceedGetPixels_TestType == test) {
             REPORTER_ASSERT(
                     r, TestImageGenerator::Color() == *bitmap.getAddr32(0, 0));
         } else {
             REPORTER_ASSERT(r, kDefaultColor == bitmap.getColor(0,0));
         }
     }
 }