Revert of Override SkCanvas::drawImage() in SkDeferredCanvas and SkGPipe

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 28 matching lines @@
     kClipRect_DrawOp,
     kClipRRect_DrawOp,
     kConcat_DrawOp,
     kDrawBitmap_DrawOp,
     kDrawBitmapMatrix_DrawOp,
     kDrawBitmapNine_DrawOp,
     kDrawBitmapRectToRect_DrawOp,
     kDrawClear_DrawOp,
     kDrawData_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 91 matching lines @@
 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 {
-    kDrawImage_HasPaint_DrawOpFlag   = 1 << 0,
-    kDrawImage_HasSrcRect_DrawOpFlag = 1 << 1,
-};
-enum {
     kClip_HasAntiAlias_DrawOpFlag = 1 << 0,
 };
 ///////////////////////////////////////////////////////////////////////////////
 
 class BitmapInfo : SkNoncopyable {
 public:
     BitmapInfo(SkBitmap* bitmap, uint32_t genID, int toBeDrawnCount)
         : fBitmap(bitmap)
         , fGenID(genID)
         , fBytesAllocated(0)
@@ skipping 111 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