From 67b8b5e67a427382fed8c5d8b3c70a21ed2492c6 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 3 Nov 2015 11:27:07 -0800 Subject: Revert of Revert[2] of "stop using drawSprite (at least w/ no filters) as it is going away" (patchset #1 id:1 of https://codereview.chromium.org/1410343011/ ) Reason for revert: failing on msaa Original issue's description: > Revert[2] of "stop using drawSprite (at least w/ no filters) as it is going away" > > Fixed assert in test that was calling GrRecordReplaceDraw(). That function now uses > drawBitmap, so updated the test to check for that (instead of drawSprite). > > This reverts commit 21b766347064837e6b78d600755901aad88cd6e0. > > BUG=skia: > TBR= > > Committed: https://skia.googlesource.com/skia/+/7b81994d95f10cda80ddb85af68a2651ff31782f TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1420053009 --- src/images/SkImageDecoder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/images') diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp index 60cc44c5b4..daeee9f0b9 100644 --- a/src/images/SkImageDecoder.cpp +++ b/src/images/SkImageDecoder.cpp @@ -206,8 +206,8 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize, paint.setXfermodeMode(SkXfermode::kSrc_Mode); SkCanvas canvas(*dst); - canvas.drawBitmap(*src, SkIntToScalar((srcX - dstX) / sampleSize), - SkIntToScalar((srcY - dstY) / sampleSize), + canvas.drawSprite(*src, (srcX - dstX) / sampleSize, + (srcY - dstY) / sampleSize, &paint); return true; } -- cgit v1.2.3