From dd1b4e94c4298213f1f238a8634471086d6749fb Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 24 Mar 2017 22:09:30 +0000 Subject: Revert "simplify api to bitmapcache" This reverts commit 9f4b0ae91e1875831cc11f0629b5db998ad85438. Reason for revert: Nanobench asserts. ../../../src/core/SkBitmapCache.cpp:81: fatal error: "assert(scaledWidth != image->width() || scaledHeight != image->height())" Aborted Command exited with code 134 step returned non-zero exit code: 134 https://chromium-swarm.appspot.com/task?id=351b1d10c7936310&refresh=10 Original change's description: > simplify api to bitmapcache > > Force all Find callers to make a bitmpacachedesc, which now > has more rigid validation. > > Goal is to ensure we never make two desc (which turn into keys) > that look different but represent the same image/transformation. > > BUG=skia: > > Change-Id: I8571837ee4754a69acc99e949bee9a465fa25f2b > Reviewed-on: https://skia-review.googlesource.com/10114 > Commit-Queue: Mike Reed > Reviewed-by: Brian Osman > TBR=brianosman@google.com,fmalita@chromium.org,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Change-Id: I21b3c8a5bae409ba740cfc28b352c3b970dcf5af Reviewed-on: https://skia-review.googlesource.com/10171 Reviewed-by: Florin Malita Commit-Queue: Florin Malita --- src/core/SkImageCacherator.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/core/SkImageCacherator.cpp') diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 06d2279946..f0bc9973a6 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -180,8 +180,7 @@ bool SkImageCacherator::directGeneratePixels(const SkImageInfo& info, void* pixe bool SkImageCacherator::lockAsBitmapOnlyIfAlreadyCached(SkBitmap* bitmap, CachedFormat format) { return kNeedNewImageUniqueID != fUniqueIDs[format] && - SkBitmapCache::Find(SkBitmapCacheDesc::Make(fUniqueIDs[format], - fInfo.width(), fInfo.height()), bitmap) && + SkBitmapCache::Find(fUniqueIDs[format], bitmap) && check_output_bitmap(*bitmap, fUniqueIDs[format]); } @@ -200,8 +199,7 @@ bool SkImageCacherator::tryLockAsBitmap(SkBitmap* bitmap, const SkImage* client, } bitmap->pixelRef()->setImmutableWithID(fUniqueIDs[format]); if (SkImage::kAllow_CachingHint == chint) { - SkBitmapCache::Add(SkBitmapCacheDesc::Make(fUniqueIDs[format], - fInfo.width(), fInfo.height()), *bitmap); + SkBitmapCache::Add(fUniqueIDs[format], *bitmap); if (client) { as_IB(client)->notifyAddedToCache(); } @@ -261,8 +259,7 @@ bool SkImageCacherator::lockAsBitmap(GrContext* context, SkBitmap* bitmap, const bitmap->pixelRef()->setImmutableWithID(fUniqueIDs[format]); if (SkImage::kAllow_CachingHint == chint) { - SkBitmapCache::Add(SkBitmapCacheDesc::Make(fUniqueIDs[format], - fInfo.width(), fInfo.height()), *bitmap); + SkBitmapCache::Add(fUniqueIDs[format], *bitmap); if (client) { as_IB(client)->notifyAddedToCache(); } -- cgit v1.2.3