Add SkEncodedFormat, used by SkCodec.

tools/PictureRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SamplePipeControllers.h"
@@ skipping 349 matching lines @@
 
 // Encodes to PNG, unless there is already encoded data, in which case that gets
 // used.
 // FIXME: Share with PictureTest.cpp?
 
 class PngPixelSerializer : public SkPixelSerializer {
 public:
     bool onUseEncodedData(const void*, size_t) SK_OVERRIDE { return true; }
     SkData* onEncodePixels(const SkImageInfo& info, const void* pixels,
                            size_t rowBytes) SK_OVERRIDE {
-        return SkImageEncoder::EncodeData(info, pixels, rowBytes, SkImageEncoder::kPNG_Type, 100);
+        return SkImageEncoder::EncodeData(info, pixels, rowBytes, kPNG_SkEncodedFormat, 100);
     }
 };
 
 bool RecordPictureRenderer::render(SkBitmap** out) {
     SkAutoTDelete<SkBBHFactory> factory(this->getFactory());
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(this->getViewWidth()),
                                                SkIntToScalar(this->getViewHeight()),
                                                factory.get(),
                                                this->recordFlags());
@@ skipping 444 matching lines @@
         case kNone_BBoxHierarchyType:
             return NULL;
         case kRTree_BBoxHierarchyType:
             return SkNEW(SkRTreeFactory);
     }
     SkASSERT(0); // invalid bbhType
     return NULL;
 }
 
 } // namespace sk_tools