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

src/pipe/SkGPipeRead.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmapHeap.h"
@@ skipping 390 matching lines @@
     SkRRect outer, inner;
     reader->readRRect(&outer);
     reader->readRRect(&inner);
     if (state->shouldDraw()) {
         canvas->drawDRRect(outer, inner, state->paint());
     }
 }
 
 static void drawPatch_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                          SkGPipeState* state) {
-
+    
     unsigned flags = DrawOp_unpackFlags(op32);
-
+    
     const SkPoint* cubics = skip<SkPoint>(reader, SkPatchUtils::kNumCtrlPts);
-
+    
     const SkColor* colors = NULL;
     if (flags & kDrawVertices_HasColors_DrawOpFlag) {
         colors = skip<SkColor>(reader, SkPatchUtils::kNumCorners);
     }
     const SkPoint* texCoords = NULL;
     if (flags & kDrawVertices_HasTexs_DrawOpFlag) {
         texCoords = skip<SkPoint>(reader, SkPatchUtils::kNumCorners);
     }
     SkAutoTUnref<SkXfermode> xfer;
     if (flags & kDrawVertices_HasXfermode_DrawOpFlag) {
@@ skipping 218 matching lines @@
                           SkGPipeState* state) {
     BitmapHolder holder(reader, op32, state);
     bool hasPaint = SkToBool(DrawOp_unpackFlags(op32) & kDrawBitmap_HasPaint_DrawOpFlag);
     const SkIPoint* point = skip<SkIPoint>(reader);
     const SkBitmap* bitmap = holder.getBitmap();
     if (state->shouldDraw()) {
         canvas->drawSprite(*bitmap, point->fX, point->fY, hasPaint ? &state->paint() : NULL);
     }
 }
 
-static void drawImage_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
-                          SkGPipeState* state) {
-    bool hasPaint = SkToBool(DrawOp_unpackFlags(op32) & kDrawBitmap_HasPaint_DrawOpFlag);
-    // Balances call to ref() in SkGPipeWrite
-    SkAutoTUnref<const SkImage> image (static_cast<const SkImage*>(reader->readPtr()));
-
-    SkScalar left = reader->readScalar();
-    SkScalar top = reader->readScalar();
-
-    if (state->shouldDraw()) {
-        canvas->drawImage(image, left, top, hasPaint ? &state->paint() : NULL);
-    }
-}
-
-static void drawImageRect_rp(SkCanvas* canvas, SkReader32* reader,
-                              uint32_t op32, SkGPipeState* state) {
-    unsigned flags = DrawOp_unpackFlags(op32);
-    bool hasPaint = SkToBool(flags & kDrawBitmap_HasPaint_DrawOpFlag);
-    bool hasSrc = SkToBool(flags & kDrawBitmap_HasSrcRect_DrawOpFlag);
-    // Balances call to ref() in SkGPipeWrite
-    SkAutoTUnref<const SkImage> image (static_cast<const SkImage*>(reader->readPtr()));
-
-    const SkRect* src;
-    if (hasSrc) {
-        src = skip<SkRect>(reader);
-    } else {
-        src = NULL;
-    }
-    const SkRect* dst = skip<SkRect>(reader);
-    if (state->shouldDraw()) {
-        canvas->drawImageRect(image, src, *dst, hasPaint ? &state->paint() : NULL);
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 static void drawData_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                         SkGPipeState* state) {
     // since we don't have a paint, we can use data for our (small) sizes
     size_t size = DrawOp_unpackData(op32);
     if (0 == size) {
         size = reader->readU32();
     }
     const void* data = reader->skip(SkAlign4(size));
@@ skipping 160 matching lines @@
     clipRect_rp,
     clipRRect_rp,
     concat_rp,
     drawBitmap_rp,
     drawBitmapMatrix_rp,
     drawBitmapNine_rp,
     drawBitmapRect_rp,
     drawClear_rp,
     drawData_rp,
     drawDRRect_rp,
-    drawImage_rp,
-    drawImageRect_rp,
     drawOval_rp,
     drawPaint_rp,
     drawPatch_rp,
     drawPath_rp,
     drawPicture_rp,
     drawPoints_rp,
     drawPosText_rp,
     drawPosTextH_rp,
     drawRect_rp,
     drawRRect_rp,
@@ skipping 113 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }