diff options
author | reed <reed@google.com> | 2014-10-03 13:23:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 13:23:31 -0700 |
commit | 37c5a815d8ea33247968212ef4cc83394ceee1bc (patch) | |
tree | 549847a55767b6deea8428b66068e82b43af13c0 /tests/SkResourceCacheTest.cpp | |
parent | 9e96aa07dbf1210fd35ae8e0c54d4d9822544e89 (diff) |
Speculative revert to diagnose crash in chrome. Revert "Add SkCachedData and use it for SkMipMap"
This reverts commit 92561a0b99ad6c08ab7a11dd1872f028199392e9.
crasher in question:
https://code.google.com/p/chromium/issues/detail?id=420178
Review URL: https://codereview.chromium.org/617613003
Diffstat (limited to 'tests/SkResourceCacheTest.cpp')
-rw-r--r-- | tests/SkResourceCacheTest.cpp | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp index 0e941758ee..f13476a5a3 100644 --- a/tests/SkResourceCacheTest.cpp +++ b/tests/SkResourceCacheTest.cpp @@ -121,55 +121,6 @@ DEF_TEST(BitmapCache_add_rect, reporter) { REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm, cache)); } -#include "SkMipMap.h" - -enum LockedState { - kNotLocked, - kLocked, -}; - -enum CachedState { - kNotInCache, - kInCache, -}; - -static void check_data(skiatest::Reporter* reporter, const SkCachedData* data, - int refcnt, CachedState cacheState, LockedState lockedState) { - REPORTER_ASSERT(reporter, data->testing_only_getRefCnt() == refcnt); - REPORTER_ASSERT(reporter, data->testing_only_isInCache() == (kInCache == cacheState)); - bool isLocked = (data->data() != NULL); - REPORTER_ASSERT(reporter, isLocked == (lockedState == kLocked)); -} - -static void test_mipmapcache(skiatest::Reporter* reporter, SkResourceCache* cache) { - cache->purgeAll(); - - SkBitmap src; - src.allocN32Pixels(5, 5); - src.setImmutable(); - - const SkMipMap* mipmap = SkMipMapCache::FindAndRef(src, cache); - REPORTER_ASSERT(reporter, NULL == mipmap); - - mipmap = SkMipMapCache::AddAndRef(src, cache); - REPORTER_ASSERT(reporter, mipmap); - check_data(reporter, mipmap, 2, kInCache, kLocked); - - mipmap->unref(); - // tricky, since technically after this I'm no longer an owner, but since the cache is - // local, I know it won't get purged behind my back - check_data(reporter, mipmap, 1, kInCache, kNotLocked); - - // find us again - mipmap = SkMipMapCache::FindAndRef(src, cache); - check_data(reporter, mipmap, 2, kInCache, kLocked); - - cache->purgeAll(); - check_data(reporter, mipmap, 1, kNotInCache, kLocked); - - mipmap->unref(); -} - DEF_TEST(BitmapCache_discarded_bitmap, reporter) { SkResourceCache::DiscardableFactory factory = SkResourceCache::GetDiscardableFactory(); SkBitmap::Allocator* allocator = SkBitmapCache::GetAllocator(); @@ -214,6 +165,4 @@ DEF_TEST(BitmapCache_discarded_bitmap, reporter) { // We can add the bitmap back to the cache and find it again. REPORTER_ASSERT(reporter, SkBitmapCache::Add(cachedBitmap.getGenerationID(), rect, cachedBitmap, cache)); REPORTER_ASSERT(reporter, SkBitmapCache::Find(cachedBitmap.getGenerationID(), rect, &bm, cache)); - - test_mipmapcache(reporter, cache); } |