| Index: tests/ImageFilterTest.cpp
|
| diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
|
| index c6991cd052795eed0fa8adee9a4ee11b5731c9fd..c9ef55944dae7d4c90c487b8ec1353985e80a729 100644
|
| --- a/tests/ImageFilterTest.cpp
|
| +++ b/tests/ImageFilterTest.cpp
|
| @@ -319,7 +319,7 @@ static void test_crop_rects(SkImageFilter::Proxy* proxy, skiatest::Reporter* rep
|
| SkIPoint offset;
|
| SkString str;
|
| str.printf("filter %d", static_cast<int>(i));
|
| - SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr, SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
| REPORTER_ASSERT_MESSAGE(reporter, filter->filterImage(proxy, bitmap, ctx,
|
| &result, &offset), str.c_str());
|
| REPORTER_ASSERT_MESSAGE(reporter, offset.fX == 20 && offset.fY == 30, str.c_str());
|
| @@ -364,12 +364,12 @@ static void test_negative_blur_sigma(SkImageFilter::Proxy* proxy, skiatest::Repo
|
| SkBitmap positiveResult1, negativeResult1;
|
| SkBitmap positiveResult2, negativeResult2;
|
| SkIPoint offset;
|
| - SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(32, 32), nullptr, SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(32, 32), nullptr);
|
| REPORTER_ASSERT(reporter, positiveFilter->filterImage(proxy, gradient, ctx, &positiveResult1, &offset));
|
| REPORTER_ASSERT(reporter, negativeFilter->filterImage(proxy, gradient, ctx, &negativeResult1, &offset));
|
| SkMatrix negativeScale;
|
| negativeScale.setScale(-SK_Scalar1, SK_Scalar1);
|
| - SkImageFilter::Context negativeCTX(negativeScale, SkIRect::MakeWH(32, 32), nullptr, SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context negativeCTX(negativeScale, SkIRect::MakeWH(32, 32), nullptr);
|
| REPORTER_ASSERT(reporter, positiveFilter->filterImage(proxy, gradient, negativeCTX, &negativeResult2, &offset));
|
| REPORTER_ASSERT(reporter, negativeFilter->filterImage(proxy, gradient, negativeCTX, &positiveResult2, &offset));
|
| SkAutoLockPixels lockP1(positiveResult1);
|
| @@ -658,8 +658,7 @@ DEF_TEST(ImageFilterMergeResultSize, reporter) {
|
| const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
| SkAutoTUnref<SkBaseDevice> device(SkBitmapDevice::Create(info, props));
|
| SkImageFilter::DeviceProxy proxy(device);
|
| - SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(0, 0, 100, 100), nullptr,
|
| - SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(0, 0, 100, 100), nullptr);
|
| SkBitmap result;
|
| SkIPoint offset;
|
| REPORTER_ASSERT(reporter, merge->filterImage(&proxy, bitmap, ctx, &result, &offset));
|
| @@ -906,7 +905,7 @@ DEF_TEST(ImageFilterClippedPictureImageFilter, reporter) {
|
|
|
| SkBitmap result;
|
| SkIPoint offset;
|
| - SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(1, 1, 1, 1), nullptr, SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(1, 1, 1, 1), nullptr);
|
| SkBitmap bitmap;
|
| bitmap.allocN32Pixels(2, 2);
|
| const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
| @@ -1159,7 +1158,7 @@ DEF_TEST(ComposedImageFilterOffset, reporter) {
|
| offsetFilter.get()));
|
| SkBitmap result;
|
| SkIPoint offset;
|
| - SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr, SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
| REPORTER_ASSERT(reporter, composedFilter->filterImage(&proxy, bitmap, ctx, &result, &offset));
|
| REPORTER_ASSERT(reporter, offset.fX == 1 && offset.fY == 0);
|
| }
|
| @@ -1177,7 +1176,7 @@ DEF_TEST(PartialCropRect, reporter) {
|
| SkAutoTUnref<SkImageFilter> filter(make_grayscale(nullptr, &cropRect));
|
| SkBitmap result;
|
| SkIPoint offset;
|
| - SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr, SkImageFilter::kApprox_SizeConstraint);
|
| + SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
| REPORTER_ASSERT(reporter, filter->filterImage(&proxy, bitmap, ctx, &result, &offset));
|
| REPORTER_ASSERT(reporter, offset.fX == 0);
|
| REPORTER_ASSERT(reporter, offset.fY == 0);
|
|
|