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

src/image/SkImage.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkImageGenerator.h"
 #include "SkImagePriv.h"
 #include "SkImage_Base.h"
 #include "SkReadPixelsRec.h"
 #include "SkString.h"
 #include "SkSurface.h"
 
 uint32_t SkImage::NextUniqueID() {
     static int32_t gUniqueID;
 
     // never return 0;
     uint32_t id;
     do {
         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 {
     SkImageInfo infoStorage;
     size_t rowBytesStorage;
     if (NULL == info) {
         info = &infoStorage;
     }
     if (NULL == rowBytes) {
         rowBytes = &rowBytesStorage;
     }
     return as_IB(this)->onPeekPixels(info, rowBytes);
@@ skipping 125 matching lines @@
     surface->getCanvas()->translate(-src.x(), -src.y());
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setFilterQuality(quality);
     surface->getCanvas()->drawImage(this, 0, 0, &paint);
     return surface->newImageSnapshot();
 }