Add SkEncodedFormat, used by SkCodec.

src/image/SkImage.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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkImageGenerator.h"
@@ skipping 47 matching lines @@
 GrTexture* SkImage::getTexture() const {
     return as_IB(this)->onGetTexture();
 }
 
 SkShader* SkImage::newShader(SkShader::TileMode tileX,
                              SkShader::TileMode tileY,
                              const SkMatrix* localMatrix) const {
     return as_IB(this)->onNewShader(tileX, tileY, localMatrix);
 }
 
-SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
+SkData* SkImage::encode(SkEncodedFormat type, int quality) const {
     SkBitmap bm;
     if (as_IB(this)->getROPixels(&bm)) {
         return SkImageEncoder::EncodeData(bm, type, quality);
     }
     return NULL;
 }
 
 SkImage* SkImage::NewFromData(SkData* data) {
     if (NULL == data) {
         return NULL;
@@ skipping 93 matching lines @@
     surface->getCanvas()->translate(-src.x(), -src.y());
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setFilterQuality(quality);
     surface->getCanvas()->drawImage(this, 0, 0, &paint);
     return surface->newImageSnapshot();
 }