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