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>

src/core/SkSpecialImage.cpp

diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index c0b5063..339341a 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -401,7 +401,8 @@
     }
 
     bool onGetROPixels(SkBitmap* dst) const override {
-        if (SkBitmapCache::Find(this->uniqueID(), dst)) {
+        const auto desc = SkBitmapCacheDesc::Make(this->uniqueID(), this->width(), this->height());
+        if (SkBitmapCache::Find(desc, dst)) {
             SkASSERT(dst->getGenerationID() == this->uniqueID());
             SkASSERT(dst->isImmutable());
             SkASSERT(dst->getPixels());
@@ -427,7 +428,7 @@
         }
 
         dst->pixelRef()->setImmutableWithID(this->uniqueID());
-        SkBitmapCache::Add(this->uniqueID(), *dst);
+        SkBitmapCache::Add(desc, *dst);
         fAddedRasterVersionToCache.store(true);
         return true;
     }