Revert of Revert of Make drawImage a virtual on SkDevice

src/image/SkImage.cpp

Index: src/image/SkImage.cpp
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index f427755d470dc4be61f436895e780c5b2fc542e9..494e21004acde43ac7e370da07765831d8d4910b 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -23,15 +23,6 @@
         id = sk_atomic_inc(&gUniqueID) + 1;
     } while (0 == id);
     return id;
-}
-
-void SkImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) const {
-    as_IB(this)->onDraw(canvas, x, y, paint);
-}
-
-void SkImage::drawRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
-                   const SkPaint* paint) const {
-    as_IB(this)->onDrawRect(canvas, src, dst, paint);
 }
 
 const void* SkImage::peekPixels(SkImageInfo* info, size_t* rowBytes) const {