Move SkImage::encode to SkImageEncoder

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 "SkImageInfo.h"
-#include "SkImageEncoder.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 #include "SkShader.h"
 
 class SkData;
 class SkCanvas;
 class SkImageGenerator;
+class SkImageEncoder;
 class SkPaint;
 class GrContext;
 class GrTexture;
 
 /**
  *  SkImage is an abstraction for drawing a rectagle of pixels, though the
  *  particular type of image could be actually storing its data on the GPU, or
  *  as drawing commands (picture or PDF or otherwise), ready to be played back
  *  into another canvas.
  *
@@ skipping 45 matching lines @@
      *  If the image has direct access to its pixels (i.e. they are in local
      *  RAM) return the (const) address of those pixels, and if not null, return
      *  the ImageInfo and rowBytes. The returned address is only valid while
      *  the image object is in scope.
      *
      *  On failure, returns NULL and the info and rowBytes parameters are
      *  ignored.
      */
     const void* peekPixels(SkImageInfo* info, size_t* rowBytes) 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;
-
 protected:
     SkImage(int width, int height) :
         fWidth(width),
         fHeight(height),
         fUniqueID(NextUniqueID()) {
 
         SkASSERT(width >= 0);
         SkASSERT(height >= 0);
     }
 
 private:
     const int       fWidth;
     const int       fHeight;
     const uint32_t  fUniqueID;
 
     static uint32_t NextUniqueID();
 
     typedef SkRefCnt INHERITED;
 
     friend class SkCanvas;
+    friend class SkImageEncoder;
 
     void draw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const;
 
     /**
      *  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.
      */
@@ skipping 14 matching lines @@
      *  using the default allocator, and the ColorType/AlphaType will be chosen
      *  to most closely fit the image's configuration.
      *
      *  On failure, false will be returned, and bitmap will unmodified.
      */
     // On ice for now:
     // - should it respect the particular colortype/alphatype of the src
     // - should it have separate entrypoints for preallocated and not bitmaps?
     // - isn't it enough to allow the caller to draw() the image into a canvas?
     bool readPixels(SkBitmap* bitmap, const SkIRect* subset = NULL) const;
+
+    /** Returns the image for encoding.
+     * Returns true if bm contains the image, false if the operation fails.
+     */
+    bool getBitmapForEncoding(SkBitmap* bm) const;
 };
 
 #endif