SkCanvas::drawImage is the new way for drawing an SkImage to a Canvas

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
 
@@ skipping 53 matching lines @@
      * Return the GrTexture that stores the image pixels. Calling getTexture
      * does not affect the reference count of the GrTexture object.
      * Will return NULL if the image does not use a texture.
      */
     GrTexture* getTexture();
 
     virtual SkShader* newShader(SkShader::TileMode,
                                 SkShader::TileMode,
                                 const SkMatrix* localMatrix = NULL) const;
 
-    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.
-     */
-    void draw(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) const;
-
     /**
      *  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;
@@ skipping 20 matching lines @@
 
 private:
     const int       fWidth;
     const int       fHeight;
     const uint32_t  fUniqueID;
 
     static uint32_t NextUniqueID();
 
     typedef SkRefCnt INHERITED;
 
+    friend class SkCanvas;
+
+    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.
+     */
+    void draw(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) const;
+
     /**
      *  Return a copy of the image's pixels, limiting them to the subset
      *  rectangle's intersection wit the image bounds. If subset is NULL, then
      *  the entire image will be considered.
      *
      *  If the bitmap's pixels have already been allocated, then readPixels()
      *  will succeed only if it can support converting the image's pixels into
      *  the bitmap's ColorType/AlphaType. Any pixels in the bitmap that do not
      *  intersect with the image's bounds and the subset (if not null) will be
      *  left untouched.
      *
      *  If the bitmap is initially empty/unallocated, then it will be allocated
      *  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;
 };
 
 #endif