Reland of move drawSprite from canvas

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 636 matching lines @@
     if (flags & kDrawBitmap_Bleed_DrawOpFlag) {
         constraint = SkCanvas::kFast_SrcRectConstraint;
     }
     const SkRect* dst = skip<SkRect>(reader);
     const SkBitmap* bitmap = holder.getBitmap();
     if (state->shouldDraw()) {
         canvas->legacy_drawBitmapRect(*bitmap, src, *dst, hasPaint ? &state->paint() : nullptr, constraint);
     }
 }
 
-static void drawSprite_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
-                          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() : nullptr);
-    }
-}
-
 static void drawImage_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, SkGPipeState* state) {
     unsigned slot = DrawOp_unpackData(op32);
     unsigned flags = DrawOp_unpackFlags(op32);
     bool hasPaint = SkToBool(flags & kDrawBitmap_HasPaint_DrawOpFlag);
     SkScalar x = reader->readScalar();
     SkScalar y = reader->readScalar();
     const SkImage* image = state->getImage(slot);
     if (state->shouldDraw()) {
         canvas->drawImage(image, x, y, hasPaint ? &state->paint() : nullptr);
     }
@@ skipping 206 matching lines @@
     drawOval_rp,
     drawPaint_rp,
     drawPatch_rp,
     drawPath_rp,
     drawPicture_rp,
     drawPoints_rp,
     drawPosText_rp,
     drawPosTextH_rp,
     drawRect_rp,
     drawRRect_rp,
-    drawSprite_rp,
     drawText_rp,
     drawTextBlob_rp,
     drawTextOnPath_rp,
     drawVertices_rp,
     restore_rp,
     rotate_rp,
     save_rp,
     saveLayer_rp,
     scale_rp,
     setMatrix_rp,
@@ skipping 103 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }