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

src/pipe/SkGPipePriv.h

Index: src/pipe/SkGPipePriv.h
diff --git a/src/pipe/SkGPipePriv.h b/src/pipe/SkGPipePriv.h
index c3919f635bd6232221d51eb37a08266a0bf1f5b5..736930b652e2e020dbc51a5bfc5f09e18b26330f 100644
--- a/src/pipe/SkGPipePriv.h
+++ b/src/pipe/SkGPipePriv.h
@@ -43,8 +43,6 @@
     kDrawBitmapNine_DrawOp,
     kDrawBitmapRectToRect_DrawOp,
     kDrawDRRect_DrawOp,
-    kDrawImage_DrawOp,
-    kDrawImageRect_DrawOp,
     kDrawOval_DrawOp,
     kDrawPaint_DrawOp,
     kDrawPatch_DrawOp,
@@ -81,7 +79,6 @@
     // these are signals to playback, not drawing verbs
     kReportFlags_DrawOp,
     kShareBitmapHeap_DrawOp,
-    kShareImageHeap_DrawOp,
     kDone_DrawOp,
 };
 
@@ -144,7 +141,6 @@
     kDrawVertices_HasIndices_DrawOpFlag  = 1 << 2,
     kDrawVertices_HasXfermode_DrawOpFlag = 1 << 3,
 };
-// These are shared between drawbitmap and drawimage
 enum {
     kDrawBitmap_HasPaint_DrawOpFlag   = 1 << 0,
     // Specific to drawBitmapRect, but needs to be different from HasPaint,
@@ -217,22 +213,6 @@
             && !(flags & SkGPipeWriter::kSharedAddressSpace_Flag));
 }
 
-class SkImageHeap : public SkRefCnt {
-public:
-    SkImageHeap();
-    virtual ~SkImageHeap();
-
-    // slot must be "valid" -- 0 is never valid
-    const SkImage* get(int32_t slot) const;
-    // returns 0 if not found, else returns slot
-    int32_t find(const SkImage*) const;
-    // returns non-zero value for where the image was stored
-    int32_t insert(const SkImage*);
-
-private:
-    SkTDArray<const SkImage*> fArray;
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 
 enum PaintOps {