Revert of Make drawImage a virtual on SkDevice

src/pipe/SkGPipePriv.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 25 matching lines @@
     // these match Canvas apis
     kClipPath_DrawOp,
     kClipRegion_DrawOp,
     kClipRect_DrawOp,
     kClipRRect_DrawOp,
     kConcat_DrawOp,
     kDrawBitmap_DrawOp,
     kDrawBitmapNine_DrawOp,
     kDrawBitmapRectToRect_DrawOp,
     kDrawDRRect_DrawOp,
-    kDrawImage_DrawOp,
-    kDrawImageRect_DrawOp,
     kDrawOval_DrawOp,
     kDrawPaint_DrawOp,
     kDrawPatch_DrawOp,
     kDrawPath_DrawOp,
     kDrawPicture_DrawOp,
     kDrawPoints_DrawOp,
     kDrawPosText_DrawOp,
     kDrawPosTextH_DrawOp,
     kDrawRect_DrawOp,
     kDrawRRect_DrawOp,
@@ skipping 16 matching lines @@
     kSetAnnotation_DrawOp,
 
     kDef_Typeface_DrawOp,
     kDef_Flattenable_DrawOp,
     kDef_Bitmap_DrawOp,
     kDef_Factory_DrawOp,
 
     // these are signals to playback, not drawing verbs
     kReportFlags_DrawOp,
     kShareBitmapHeap_DrawOp,
-    kShareImageHeap_DrawOp,
     kDone_DrawOp,
 };
 
 /**
  *  DrawOp packs into a 32bit int as follows
  *
  *  DrawOp:8 - Flags:4 - Data:20
  *
  *  Flags and Data are called out separately, so we can reuse Data between
  *  different Ops that might have different Flags. e.g. Data might be a Paint
@@ skipping 42 matching lines @@
 };
 enum {
     kDrawTextOnPath_HasMatrix_DrawOpFlag = 1 << 0
 };
 enum {
     kDrawVertices_HasTexs_DrawOpFlag     = 1 << 0,
     kDrawVertices_HasColors_DrawOpFlag   = 1 << 1,
     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,
     // which is used for all drawBitmap calls, so include it here.
     kDrawBitmap_HasSrcRect_DrawOpFlag = 1 << 1,
     // SkCanvas::DrawBitmapRectFlags::kBleed_DrawBitmapRectFlag is
     // converted into and out of this flag to save space
     kDrawBitmap_Bleed_DrawOpFlag      = 1 << 2,
 };
 enum {
@@ skipping 52 matching lines @@
     BitmapInfo* fLessRecentlyUsed;
 private:
     int      fToBeDrawnCount;
 };
 
 static inline bool shouldFlattenBitmaps(uint32_t flags) {
     return SkToBool(flags & SkGPipeWriter::kCrossProcess_Flag
             && !(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 {
     kReset_PaintOp,     // no arg
 
     kFlags_PaintOp,     // arg inline
     kColor_PaintOp,     // arg 32
     kFilterLevel_PaintOp,   // arg inline
     kStyle_PaintOp,     // arg inline
     kJoin_PaintOp,      // arg inline
@@ skipping 49 matching lines @@
     SkASSERT(0 == (op & ~PAINTOPS_OP_MASK));
     SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK));
     SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK));
 
     return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) |
     (flags << PAINTOPS_DATA_BITS) |
     data;
 }
 
 #endif