Index: tests/ImageFilterCacheTest.cpp |
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp |
index 688069ea45908a8fb6958515ff0936aa51bb25ea..40c805a14ec9c140e38d42bca088c49a981d545d 100644 |
--- a/tests/ImageFilterCacheTest.cpp |
+++ b/tests/ImageFilterCacheTest.cpp |
@@ -138,11 +138,11 @@ DEF_TEST(ImageFilterCache_RasterBacked, reporter) { |
const SkIRect& full = SkIRect::MakeWH(kFullSize, kFullSize); |
- sk_sp<SkSpecialImage> fullImg(SkSpecialImage::MakeFromRaster(nullptr, full, srcBM)); |
+ sk_sp<SkSpecialImage> fullImg(SkSpecialImage::MakeFromRaster(full, srcBM)); |
const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); |
- sk_sp<SkSpecialImage> subsetImg(SkSpecialImage::MakeFromRaster(nullptr, subset, srcBM)); |
+ sk_sp<SkSpecialImage> subsetImg(SkSpecialImage::MakeFromRaster(subset, srcBM)); |
test_find_existing(reporter, fullImg, subsetImg); |
test_dont_find_if_diff_key(reporter, fullImg, subsetImg); |
@@ -155,11 +155,11 @@ DEF_TEST(ImageFilterCache_RasterBacked, reporter) { |
static void test_image_backed(skiatest::Reporter* reporter, const sk_sp<SkImage>& srcImage) { |
const SkIRect& full = SkIRect::MakeWH(kFullSize, kFullSize); |
- sk_sp<SkSpecialImage> fullImg(SkSpecialImage::MakeFromImage(nullptr, full, srcImage)); |
+ sk_sp<SkSpecialImage> fullImg(SkSpecialImage::MakeFromImage(full, srcImage)); |
const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); |
- sk_sp<SkSpecialImage> subsetImg(SkSpecialImage::MakeFromImage(nullptr, subset, srcImage)); |
+ sk_sp<SkSpecialImage> subsetImg(SkSpecialImage::MakeFromImage(subset, srcImage)); |
test_find_existing(reporter, fullImg, subsetImg); |
test_dont_find_if_diff_key(reporter, fullImg, subsetImg); |
@@ -220,13 +220,13 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_GPUBacked, reporter, ctxInfo |
const SkIRect& full = SkIRect::MakeWH(kFullSize, kFullSize); |
- sk_sp<SkSpecialImage> fullImg(SkSpecialImage::MakeFromGpu(nullptr, full, |
+ sk_sp<SkSpecialImage> fullImg(SkSpecialImage::MakeFromGpu(full, |
kNeedNewImageUniqueID_SpecialImage, |
srcTexture)); |
const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); |
- sk_sp<SkSpecialImage> subsetImg(SkSpecialImage::MakeFromGpu(nullptr, subset, |
+ sk_sp<SkSpecialImage> subsetImg(SkSpecialImage::MakeFromGpu(subset, |
kNeedNewImageUniqueID_SpecialImage, |
srcTexture)); |