aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleAll.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-11-03 07:12:16 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-03 07:12:16 -0800
commit7b81994d95f10cda80ddb85af68a2651ff31782f (patch)
tree14782d6ce58286928c4320e839c4b6133c39f69e /samplecode/SampleAll.cpp
parente51fa4ac31716863b80633419370e7e4174ead61 (diff)
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= Review URL: https://codereview.chromium.org/1410343011
Diffstat (limited to 'samplecode/SampleAll.cpp')
-rw-r--r--samplecode/SampleAll.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 628504d90d..b5a0fe568d 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -440,14 +440,10 @@ protected:
canvas->drawPath(path, paint);
paint.setShader(nullptr);
- // bitmap, sprite
+ // bitmap
canvas->translate(SkIntToScalar(50), 0);
paint.setStyle(SkPaint::kFill_Style);
canvas->drawBitmap(fBug, left, top, &paint);
- canvas->translate(SkIntToScalar(30), 0);
- canvas->drawSprite(fTb,
- SkScalarRoundToInt(canvas->getTotalMatrix().getTranslateX()),
- spriteOffset + 10, &paint);
canvas->translate(-SkIntToScalar(30), SkIntToScalar(30));
paint.setShader(shaderTest())->unref(); // test compose shader