Revert of Revert of Make drawImage a virtual on SkDevice

src/image/SkImage_Base.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_Base_DEFINED
 #define SkImage_Base_DEFINED
 
@@ skipping 18 matching lines @@
     void initWithProps(const SkSurfaceProps& props) {
         SkASSERT(this->unique());   // only viewed by one thread
         SkSurfaceProps* mutableProps = const_cast<SkSurfaceProps*>(&fProps);
         SkASSERT(mutableProps != &props);   // check for self-assignment
         mutableProps->~SkSurfaceProps();
         new (mutableProps) SkSurfaceProps(props);
     }
 
     const SkSurfaceProps& props() const { return fProps; }
 
-    virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const = 0;
-    virtual void onDrawRect(SkCanvas*, const SkRect* src,
-                                  const SkRect& dst, const SkPaint*) const = 0;
     virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) const = 0;
 
     virtual const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const {
         return NULL;
     }
 
     // Default impl calls onDraw
     virtual bool onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                               int srcX, int srcY) const;
     
@@ skipping 19 matching lines @@
 
 static inline SkImage_Base* as_IB(SkImage* image) {
     return static_cast<SkImage_Base*>(image);
 }
 
 static inline const SkImage_Base* as_IB(const SkImage* image) {
     return static_cast<const SkImage_Base*>(image);
 }
 
 #endif