diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-09 05:17:10 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 05:17:10 -0800 |
| commit | 6ac97b7eb99c06107bb4536e1a888fce7837213a (patch) | |
| tree | 8397edb422986450ffa5f7ed29cbc017b7fc1f40 /tests | |
| parent | 8a21c9fe7f5fef9e87115defef27bd7218419f28 (diff) | |
Switch SkImageSource image filter over to new onFilterImage interface
This CL relies on: https://codereview.chromium.org/1762013002/ (Swap over to using SkImageFilter::filterImage instead of filterImageDeprecated)
TBR=bsalomon@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1772933002
Review URL: https://codereview.chromium.org/1772933002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageFilterCacheTest.cpp | 6 | ||||
| -rw-r--r-- | tests/SpecialImageTest.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index 3494011393..f355714c52 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -152,11 +152,13 @@ DEF_TEST(ImageFilterCache_RasterBacked, reporter) { static void test_image_backed(skiatest::Reporter* reporter, SkImage* srcImage) { const SkIRect& full = SkIRect::MakeWH(kFullSize, kFullSize); - SkAutoTUnref<SkSpecialImage> fullImg(SkSpecialImage::NewFromImage(full, srcImage)); + SkAutoTUnref<SkSpecialImage> fullImg(SkSpecialImage::NewFromImage(nullptr, full, srcImage)); const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); - SkAutoTUnref<SkSpecialImage> subsetImg(SkSpecialImage::NewFromImage(subset, srcImage)); + SkAutoTUnref<SkSpecialImage> subsetImg(SkSpecialImage::NewFromImage(nullptr, + subset, + srcImage)); test_find_existing(reporter, fullImg, subsetImg); test_dont_find_if_diff_key(reporter, fullImg, subsetImg); diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 3dd6da92f4..9bde7eec33 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -108,7 +108,7 @@ DEF_TEST(SpecialImage_Image, reporter) { const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); - SkAutoTUnref<SkSpecialImage> img(SkSpecialImage::NewFromImage(subset, fullImage)); + SkAutoTUnref<SkSpecialImage> img(SkSpecialImage::NewFromImage(nullptr, subset, fullImage)); test_image(img, reporter, true, false); } |