From da926dbd6978202a6ced783cd184cb8512cde2aa Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 3 May 2018 14:39:57 -0400 Subject: Remove fCacheKeys from SkImageFilter. No public API changes. Bug: skia:7666, skia:7887 Change-Id: I8ac4ec37dd3d0fcc050bc977db41439a8e18895f Reviewed-on: https://skia-review.googlesource.com/125500 Commit-Queue: Ben Wagner Reviewed-by: Mike Klein Auto-Submit: Ben Wagner --- tests/ImageFilterCacheTest.cpp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'tests/ImageFilterCacheTest.cpp') diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index e9c9f0b14e..f4640d1439 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -8,6 +8,8 @@ #include "Test.h" #include "SkBitmap.h" +#include "SkColorFilter.h" +#include "SkColorFilterImageFilter.h" #include "SkImage.h" #include "SkImageFilter.h" #include "SkImageFilterCache.h" @@ -25,6 +27,12 @@ static SkBitmap create_bm() { return bm; } +static sk_sp make_filter() { + sk_sp filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, + SkBlendMode::kSrcIn)); + return SkColorFilterImageFilter::Make(std::move(filter), nullptr, nullptr); +} + // Ensure the cache can return a cached image static void test_find_existing(skiatest::Reporter* reporter, const sk_sp& image, @@ -37,7 +45,8 @@ static void test_find_existing(skiatest::Reporter* reporter, SkImageFilterCacheKey key2(0, SkMatrix::I(), clip, subset->uniqueID(), subset->subset()); SkIPoint offset = SkIPoint::Make(3, 4); - cache->set(key1, image.get(), offset, nullptr); + auto filter = make_filter(); + cache->set(key1, image.get(), offset, filter.get()); SkIPoint foundOffset; @@ -66,7 +75,8 @@ static void test_dont_find_if_diff_key(skiatest::Reporter* reporter, SkImageFilterCacheKey key4(0, SkMatrix::I(), clip1, subset->uniqueID(), subset->subset()); SkIPoint offset = SkIPoint::Make(3, 4); - cache->set(key0, image.get(), offset, nullptr); + auto filter = make_filter(); + cache->set(key0, image.get(), offset, filter.get()); SkIPoint foundOffset; REPORTER_ASSERT(reporter, !cache->get(key1, &foundOffset)); @@ -86,14 +96,16 @@ static void test_internal_purge(skiatest::Reporter* reporter, const sk_spuniqueID(), image->subset()); SkIPoint offset = SkIPoint::Make(3, 4); - cache->set(key1, image.get(), offset, nullptr); + auto filter1 = make_filter(); + cache->set(key1, image.get(), offset, filter1.get()); SkIPoint foundOffset; REPORTER_ASSERT(reporter, cache->get(key1, &foundOffset)); // This should knock the first one out of the cache - cache->set(key2, image.get(), offset, nullptr); + auto filter2 = make_filter(); + cache->set(key2, image.get(), offset, filter2.get()); REPORTER_ASSERT(reporter, cache->get(key2, &foundOffset)); REPORTER_ASSERT(reporter, !cache->get(key1, &foundOffset)); @@ -111,8 +123,10 @@ static void test_explicit_purging(skiatest::Reporter* reporter, SkImageFilterCacheKey key2(1, SkMatrix::I(), clip, subset->uniqueID(), image->subset()); SkIPoint offset = SkIPoint::Make(3, 4); - cache->set(key1, image.get(), offset, nullptr); - cache->set(key2, image.get(), offset, nullptr); + auto filter1 = make_filter(); + auto filter2 = make_filter(); + cache->set(key1, image.get(), offset, filter1.get()); + cache->set(key2, image.get(), offset, filter2.get()); SkDEBUGCODE(REPORTER_ASSERT(reporter, 2 == cache->count());) SkIPoint foundOffset; @@ -120,7 +134,7 @@ static void test_explicit_purging(skiatest::Reporter* reporter, REPORTER_ASSERT(reporter, cache->get(key1, &foundOffset)); REPORTER_ASSERT(reporter, cache->get(key2, &foundOffset)); - cache->purgeByKeys(&key1, 1); + cache->purgeByImageFilter(filter1.get()); SkDEBUGCODE(REPORTER_ASSERT(reporter, 1 == cache->count());) REPORTER_ASSERT(reporter, !cache->get(key1, &foundOffset)); -- cgit v1.2.3