Revert of Revert of Revert of Make drawImage a virtual on SkDevice

include/core/SkImage.h

Index: include/core/SkImage.h
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index ebc9a2939408ad113b14329d7545cb51a5b3279d..ec855166195d863bd014156deda1bf03742f2451 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -172,6 +172,19 @@
     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 drawRect(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) const;
 };
 
 #endif