Add SkEncodedFormat, used by SkCodec.

include/core/SkImage.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImage_DEFINED
 #define SkImage_DEFINED
 
+#include "SkEncodedFormat.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
 #include "SkImageEncoder.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 #include "SkShader.h"
 
 class SkData;
 class SkCanvas;
 class SkImageGenerator;
@@ skipping 91 matching lines @@
     bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                     int srcX, int srcY) const;
 
     /**
      *  Encode the image's pixels and return the result as a new SkData, which
      *  the caller must manage (i.e. call unref() when they are done).
      *
      *  If the image type cannot be encoded, or the requested encoder type is
      *  not supported, this will return NULL.
      */
-    SkData* encode(SkImageEncoder::Type t = SkImageEncoder::kPNG_Type,
-                   int quality = 80) const;
+    SkData* encode(SkEncodedFormat f = kPNG_SkEncodedFormat, int quality = 80) const;
 
     /**
      *  Return a new surface that is compatible with this image's internal representation
      *  (e.g. raster or gpu).
      *
      *  If no surfaceprops are specified, the image will attempt to match the props of when it
      *  was created (if it came from a surface).
      */
     SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps* = NULL) const;
 
@@ skipping 47 matching lines @@
      *  Draw the image, cropped to the src rect, to the dst rect of a canvas.
      *  If src is larger than the bounds of the image, the rest of the image is
      *  filled with transparent black pixels.
      *
      *  See SkCanvas::drawBitmapRectToRect for similar behavior.
      */
     void drawRect(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) const;
 };
 
 #endif