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

include/core/SkCanvas.h

Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 5828466d62e52202fa9185ccb7e596c9857413de..77038c3067b2803bda471e5d8e6d9daafbf907c4 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -29,7 +29,6 @@
 class SkBaseDevice;
 class SkDraw;
 class SkDrawFilter;
-class SkImage;
 class SkMetaData;
 class SkPicture;
 class SkRRect;
@@ -812,13 +811,6 @@
     */
     virtual void drawPath(const SkPath& path, const SkPaint& paint);
 
-    virtual void drawImage(const SkImage* image, SkScalar left, SkScalar top,
-                           const SkPaint* paint = NULL);
-
-    virtual void drawImageRect(const SkImage* image, const SkRect* src,
-                               const SkRect& dst,
-                               const SkPaint* paint = NULL);
-
     /** Draw the specified bitmap, with its top/left corner at (x,y), using the
         specified paint, transformed by the current matrix. Note: if the paint
         contains a maskfilter that generates a mask which extends beyond the
@@ -1321,7 +1313,7 @@
     friend class SkSurface_Raster;  // needs getDevice()
     friend class SkRecorder;        // InitFlags
     friend class SkNoSaveLayerCanvas;   // InitFlags
-
+    
     enum InitFlags {
         kDefault_InitFlags                  = 0,
         kConservativeRasterClip_InitFlag    = 1 << 0,
@@ -1332,7 +1324,7 @@
 
     // needs gettotalclip()
     friend SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas*);
-
+    
     SkBaseDevice* createLayerDevice(const SkImageInfo&);
 
     // call this each time we attach ourselves to a device