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

src/core/SkPaintPriv.h

Index: src/core/SkPaintPriv.h
diff --git a/src/core/SkPaintPriv.h b/src/core/SkPaintPriv.h
index be441b8f7225f2e07caa0e021a95735a22a1bf7e..88fc4fc3494ca1aed8d0eee6d71ea362bf2da50d 100644
--- a/src/core/SkPaintPriv.h
+++ b/src/core/SkPaintPriv.h
@@ -8,11 +8,10 @@
 #ifndef SkPaintPriv_DEFINED
 #define SkPaintPriv_DEFINED
 
+class SkBitmap;
+class SkPaint;
+
 #include "SkTypes.h"
-
-class SkBitmap;
-class SkImage;
-class SkPaint;
 
 enum SkPaintBitmapOpacity {
     // No content replaces the paint's color
@@ -41,7 +40,6 @@
         shader.
     @return true if paint is opaque
 */
-bool isPaintOpaque(const SkPaint* paint, const SkBitmap* bmpReplacesShader = NULL);
-bool isPaintOpaque(const SkPaint* paint, const SkImage* image);
-
+bool isPaintOpaque(const SkPaint* paint,
+                   const SkBitmap* bmpReplacesShader = NULL);
 #endif