diff options
author | reed <reed@google.com> | 2015-12-16 07:52:46 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-16 07:52:47 -0800 |
commit | 4657ce2324ea197507c4ba728d81138f56da13b1 (patch) | |
tree | 79cba010f59bd353e51cbdc2494ff9f1ff423fce /src/pipe | |
parent | ce5ac45d39db3c7fe52acaa59117688aec53710e (diff) |
remove drawSprite from canvas
BUG=skia:
Review URL: https://codereview.chromium.org/1534443003
Diffstat (limited to 'src/pipe')
-rw-r--r-- | src/pipe/SkGPipePriv.h | 1 | ||||
-rw-r--r-- | src/pipe/SkGPipeRead.cpp | 12 | ||||
-rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 11 |
3 files changed, 0 insertions, 24 deletions
diff --git a/src/pipe/SkGPipePriv.h b/src/pipe/SkGPipePriv.h index c4217f3bf9..1820a4941a 100644 --- a/src/pipe/SkGPipePriv.h +++ b/src/pipe/SkGPipePriv.h @@ -57,7 +57,6 @@ enum DrawOps { kDrawPosTextH_DrawOp, kDrawRect_DrawOp, kDrawRRect_DrawOp, - kDrawSprite_DrawOp, kDrawText_DrawOp, kDrawTextBlob_DrawOp, kDrawTextOnPath_DrawOp, diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp index 4d57a6cca9..24f3e2d1ea 100644 --- a/src/pipe/SkGPipeRead.cpp +++ b/src/pipe/SkGPipeRead.cpp @@ -654,17 +654,6 @@ static void drawBitmapRect_rp(SkCanvas* canvas, SkReader32* reader, } } -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); @@ -891,7 +880,6 @@ static const ReadProc gReadTable[] = { drawPosTextH_rp, drawRect_rp, drawRRect_rp, - drawSprite_rp, drawText_rp, drawTextBlob_rp, drawTextOnPath_rp, diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index 0fccb80d0a..2cab09c9e1 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -284,7 +284,6 @@ protected: const SkPaint*) override; void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, const SkPaint*) override; - void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, @@ -828,16 +827,6 @@ void SkGPipeCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center, } } -void SkGPipeCanvas::onDrawSprite(const SkBitmap& bm, int left, int top, const SkPaint* paint) { - NOTIFY_SETUP(this); - size_t opBytesNeeded = sizeof(int32_t) * 2; - - if (this->commonDrawBitmap(bm, kDrawSprite_DrawOp, 0, opBytesNeeded, paint)) { - fWriter.write32(left); - fWriter.write32(top); - } -} - bool SkGPipeCanvas::commonDrawImage(const SkImage* image, DrawOps op, unsigned flags, size_t opBytesNeeded, const SkPaint* paint) { if (fDone) { |