add readPixels to SkImage

include/core/SkSurface.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 SkSurface_DEFINED
 #define SkSurface_DEFINED
 
@@ skipping 196 matching lines @@
      *  the surface object is in scope, and no API call is made on the surface
      *  or its canvas.
      *
      *  On failure, returns NULL and the info and rowBytes parameters are
      *  ignored.
      */
     const void* peekPixels(SkImageInfo* info, size_t* rowBytes);
 
     /**
      *  Copy the pixels from the surface into the specified buffer (pixels + rowBytes),
-     *  converting them into the requested format (dstInfo). The base-layer pixels are read
-     *  starting at the specified (srcX,srcY) location in the coordinate system of the base-layer.
+     *  converting them into the requested format (dstInfo). The surface pixels are read
+     *  starting at the specified (srcX,srcY) location.
      *
      *  The specified ImageInfo and (srcX,srcY) offset specifies a source rectangle
      *
      *      srcR.setXYWH(srcX, srcY, dstInfo.width(), dstInfo.height());
      *
      *  srcR is intersected with the bounds of the base-layer. If this intersection is not empty,
      *  then we have two sets of pixels (of equal size). Replace the dst pixels with the
      *  corresponding src pixels, performing any colortype/alphatype transformations needed
      *  (in the case where the src and dst have different colortypes or alphatypes).
      *
      *  This call can fail, returning false, for several reasons:
      *  - If srcR does not intersect the surface bounds.
-     *  - If the requested colortype/alphatype cannot be converted from the base-layer's types.
+     *  - If the requested colortype/alphatype cannot be converted from the surface's types.
      */
     bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                     int srcX, int srcY);
 
-    /**
-     *  Helper for allocating pixels and then calling readPixels(info, ...). The bitmap is resized
-     *  to the intersection of srcRect and the surface bounds (if srcRect is non-null).
-     *  On success, pixels will be allocated in bitmap and true returned. On failure,
-     *  false is returned and bitmap will be set to empty.
-     */
-    bool readPixels(SkBitmap* dst, const SkIRect* srcRect = NULL);
-
     const SkSurfaceProps& props() const { return fProps; }
 
 protected:
     SkSurface(int width, int height, const SkSurfaceProps*);
     SkSurface(const SkImageInfo&, const SkSurfaceProps*);
 
     // called by subclass if their contents have changed
     void dirtyGenerationID() {
         fGenerationID = 0;
     }
 
 private:
     const SkSurfaceProps fProps;
     const int            fWidth;
     const int            fHeight;
     uint32_t             fGenerationID;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif