| Index: gm/xfermodeimagefilter.cpp
|
| diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp
|
| index 3293c81ba4ba49c12edea15e754436426215fed4..ee6822a3f44f9d3e86c21273c9882fd6a7b08141 100644
|
| --- a/gm/xfermodeimagefilter.cpp
|
| +++ b/gm/xfermodeimagefilter.cpp
|
| @@ -88,7 +88,7 @@ protected:
|
| sk_sp<SkImageFilter> background(SkImageSource::Make(fCheckerboard));
|
| for (size_t i = 0; i < SK_ARRAY_COUNT(gModes); i++) {
|
| paint.setImageFilter(SkXfermodeImageFilter::Make(SkXfermode::Make(gModes[i].fMode),
|
| - background.get()));
|
| + background));
|
| DrawClippedBitmap(canvas, fBitmap, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| if (x + fBitmap.width() > WIDTH) {
|
| @@ -98,7 +98,8 @@ protected:
|
| }
|
| // Test arithmetic mode as image filter
|
| paint.setImageFilter(SkXfermodeImageFilter::Make(
|
| - SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0), background.get()));
|
| + SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0),
|
| + background));
|
| DrawClippedBitmap(canvas, fBitmap, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| if (x + fBitmap.width() > WIDTH) {
|
| @@ -106,7 +107,7 @@ protected:
|
| y += fBitmap.height() + MARGIN;
|
| }
|
| // Test nullptr mode
|
| - paint.setImageFilter(SkXfermodeImageFilter::Make(nullptr, background.get()));
|
| + paint.setImageFilter(SkXfermodeImageFilter::Make(nullptr, background));
|
| DrawClippedBitmap(canvas, fBitmap, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| if (x + fBitmap.width() > WIDTH) {
|
| @@ -126,8 +127,8 @@ protected:
|
| background));
|
| paint.setImageFilter(SkXfermodeImageFilter::Make(
|
| SkXfermode::Make(SkXfermode::kSrcOver_Mode),
|
| - offsetBackground.get(),
|
| - offsetForeground.get(),
|
| + offsetBackground,
|
| + offsetForeground,
|
| nullptr));
|
| DrawClippedPaint(canvas, clipRect, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| @@ -137,8 +138,8 @@ protected:
|
| }
|
| // Test offsets on Darken (uses shader blend)
|
| paint.setImageFilter(SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kDarken_Mode),
|
| - offsetBackground.get(),
|
| - offsetForeground.get(),
|
| + offsetBackground,
|
| + offsetForeground,
|
| nullptr));
|
| DrawClippedPaint(canvas, clipRect, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| @@ -161,8 +162,8 @@ protected:
|
| fBitmap.height() + offsets[i][3]);
|
| SkImageFilter::CropRect rect(SkRect::Make(cropRect));
|
| paint.setImageFilter(SkXfermodeImageFilter::Make(SkXfermode::Make(sampledModes[i]),
|
| - offsetBackground.get(),
|
| - offsetForeground.get(),
|
| + offsetBackground,
|
| + offsetForeground,
|
| &rect));
|
| DrawClippedPaint(canvas, clipRect, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| @@ -175,8 +176,7 @@ protected:
|
| auto mode = SkXfermode::Make(SkXfermode::kScreen_Mode);
|
| SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(10, 10, 60, 60));
|
| sk_sp<SkImageFilter> cropped(SkOffsetImageFilter::Make(0, 0, foreground, &cropRect));
|
| - paint.setImageFilter(SkXfermodeImageFilter::Make(mode, cropped.get(),
|
| - background.get(), nullptr));
|
| + paint.setImageFilter(SkXfermodeImageFilter::Make(mode, cropped, background, nullptr));
|
| DrawClippedPaint(canvas, clipRect, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| if (x + fBitmap.width() > WIDTH) {
|
| @@ -184,8 +184,7 @@ protected:
|
| y += fBitmap.height() + MARGIN;
|
| }
|
| // Test small fg, large bg with Screen (uses shader blend)
|
| - paint.setImageFilter(SkXfermodeImageFilter::Make(mode, background.get(),
|
| - cropped.get(), nullptr));
|
| + paint.setImageFilter(SkXfermodeImageFilter::Make(mode, background, cropped, nullptr));
|
| DrawClippedPaint(canvas, clipRect, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| if (x + fBitmap.width() > WIDTH) {
|
| @@ -197,8 +196,8 @@ protected:
|
| // the region outside the foreground.
|
| mode = SkXfermode::Make(SkXfermode::kSrcIn_Mode);
|
| SkImageFilter::CropRect cropRectFull(SkRect::MakeXYWH(0, 0, 80, 80));
|
| - paint.setImageFilter(SkXfermodeImageFilter::Make(mode, background.get(),
|
| - cropped.get(), &cropRectFull));
|
| + paint.setImageFilter(SkXfermodeImageFilter::Make(mode, background,
|
| + cropped, &cropRectFull));
|
| DrawClippedPaint(canvas, clipRect, paint, x, y);
|
| x += fBitmap.width() + MARGIN;
|
| if (x + fBitmap.width() > WIDTH) {
|
|
|