diff options
author | 2015-12-16 08:38:15 -0800 | |
---|---|---|
committer | 2015-12-16 08:38:16 -0800 | |
commit | da420b976e61071cfe5de10556b4b23e519091d6 (patch) | |
tree | 79cba010f59bd353e51cbdc2494ff9f1ff423fce /tests/ImageFilterTest.cpp | |
parent | 32704674f64cb6a14356dfebe060cd3484c06cc7 (diff) |
Reland of move drawSprite from canvas (patchset #1 id:1 of https://codereview.chromium.org/1529803004/ )
Reason for revert:
guard has landed in chrome
Original issue's description:
> Revert of remove drawSprite from canvas (patchset #4 id:60001 of https://codereview.chromium.org/1534443003/ )
>
> Reason for revert:
> need to remove an override in chrome
>
> Original issue's description:
> > remove drawSprite from canvas
> >
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/4657ce2324ea197507c4ba728d81138f56da13b1
>
> TBR=fmalita@chromium.org,robertphillips@google.com,senorblanco@chromium.org,mtklein@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/32704674f64cb6a14356dfebe060cd3484c06cc7
TBR=fmalita@chromium.org,robertphillips@google.com,senorblanco@chromium.org,mtklein@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1530203002
Diffstat (limited to 'tests/ImageFilterTest.cpp')
-rw-r--r-- | tests/ImageFilterTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 6a6a7a92d6..1bf8cbdb73 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -977,7 +977,7 @@ static void test_huge_blur(SkCanvas* canvas, skiatest::Reporter* reporter) { SkPaint paint; paint.setImageFilter(blur); - canvas->drawSprite(bitmap, 0, 0, &paint); + canvas->drawBitmap(bitmap, 0, 0, &paint); } DEF_TEST(HugeBlurImageFilter, reporter) { @@ -1067,7 +1067,7 @@ static void test_xfermode_cropped_input(SkCanvas* canvas, skiatest::Reporter* re SkPaint paint; paint.setImageFilter(xfermodeNoFg); - canvas->drawSprite(bitmap, 0, 0, &paint); + canvas->drawBitmap(bitmap, 0, 0, &paint); // drawSprite uint32_t pixel; SkImageInfo info = SkImageInfo::Make(1, 1, kBGRA_8888_SkColorType, kUnpremul_SkAlphaType); @@ -1075,12 +1075,12 @@ static void test_xfermode_cropped_input(SkCanvas* canvas, skiatest::Reporter* re REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN); paint.setImageFilter(xfermodeNoBg); - canvas->drawSprite(bitmap, 0, 0, &paint); + canvas->drawBitmap(bitmap, 0, 0, &paint); // drawSprite canvas->readPixels(info, &pixel, 4, 0, 0); REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN); paint.setImageFilter(xfermodeNoFgNoBg); - canvas->drawSprite(bitmap, 0, 0, &paint); + canvas->drawBitmap(bitmap, 0, 0, &paint); // drawSprite canvas->readPixels(info, &pixel, 4, 0, 0); REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN); } @@ -1128,7 +1128,7 @@ DEF_TEST(ImageFilterNestedSaveLayer, reporter) { canvas.clear(0x0); canvas.readPixels(info, &pixel, 4, 25, 25); canvas.saveLayer(&bounds1, nullptr); - canvas.drawSprite(bitmap, 20, 20, &filterPaint); + canvas.drawBitmap(bitmap, 20, 20, &filterPaint); // drawSprite canvas.restore(); canvas.readPixels(info, &pixel, 4, 25, 25); |