commit 5fa3d6d4b15fd6417de877561f5e4bca422e383c
author Mike Reed <reed@google.com> Sat Mar 25 09:51:00 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Mar 25 14:25:58 2017 +0000
tree 2233095e21606cff0781915876dcf0994b4907de
parent 1b52df33927c00d9c5aee63f7239dd77bce15e03

Revert "Revert "simplify api to bitmapcache""

Remove (for now) overly agressive assert

This reverts commit dd1b4e94c4298213f1f238a8634471086d6749fb.

Bug: skia:
Change-Id: Ibdcf0b2e92cf108ae710cd180d4fa359f81176d1
Reviewed-on: https://skia-review.googlesource.com/10129
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

tests/SkResourceCacheTest.cpp

diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp
index 542d80e..b260d89 100644
--- a/tests/SkResourceCacheTest.cpp
+++ b/tests/SkResourceCacheTest.cpp
@@ -89,8 +89,8 @@
     }
 
     for (int i = 0; i < N; ++i) {
-        const SkMipMap* mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src[i]),
-                                                           colorMode, cache);
+        const auto desc = SkBitmapCacheDesc::Make(src[i]);
+        const SkMipMap* mipmap = SkMipMapCache::FindAndRef(desc, colorMode, cache);
         if (cache) {
             // if cache is null, we're working on the global cache, and other threads might purge
             // it, making this check fragile.
@@ -100,7 +100,7 @@
 
         src[i].reset(); // delete the underlying pixelref, which *should* remove us from the cache
 
-        mipmap = SkMipMapCache::FindAndRef(SkBitmapCacheDesc::Make(src[i]), colorMode, cache);
+        mipmap = SkMipMapCache::FindAndRef(desc, colorMode, cache);
         REPORTER_ASSERT(reporter, !mipmap);
     }
 }
@@ -156,14 +156,14 @@
         canvas->concat(transform);
         canvas->drawImage(image, 0, 0, &paint);
 
-        auto imageId = image->uniqueID();
+        const auto desc = SkBitmapCacheDesc::Make(image.get());
 
         // delete the image
         image.reset(nullptr);
 
         // all resources should have been purged
         SkBitmap result;
-        REPORTER_ASSERT(reporter, !SkBitmapCache::Find(imageId, &result));
+        REPORTER_ASSERT(reporter, !SkBitmapCache::Find(desc, &result));
     }
 }