diff options
| author |  Mike Reed <reed@google.com> | 2017-03-25 09:51:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-25 14:25:58 +0000 |
| commit | 5fa3d6d4b15fd6417de877561f5e4bca422e383c (patch) | |
| tree | 2233095e21606cff0781915876dcf0994b4907de /src/core/SkBitmapController.cpp | |
| parent | 1b52df33927c00d9c5aee63f7239dd77bce15e03 (diff) | |
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>
Diffstat (limited to 'src/core/SkBitmapController.cpp')
| -rw-r--r-- | src/core/SkBitmapController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp index 8bec804243..7ef0a99cb6 100644 --- a/src/core/SkBitmapController.cpp +++ b/src/core/SkBitmapController.cpp @@ -124,7 +124,7 @@ bool SkDefaultBitmapControllerState::processHQRequest(const SkBitmapProvider& pr const int dstH = SkScalarRoundToScalar(provider.height() / invScaleY); const SkBitmapCacheDesc desc = provider.makeCacheDesc(dstW, dstH); - if (!SkBitmapCache::FindWH(desc, &fResultBitmap)) { + if (!SkBitmapCache::Find(desc, &fResultBitmap)) { SkBitmap orig; if (!provider.asBitmap(&orig)) { return false; @@ -141,7 +141,7 @@ bool SkDefaultBitmapControllerState::processHQRequest(const SkBitmapProvider& pr SkASSERT(fResultBitmap.getPixels()); fResultBitmap.setImmutable(); if (!provider.isVolatile()) { - if (SkBitmapCache::AddWH(desc, fResultBitmap)) { + if (SkBitmapCache::Add(desc, fResultBitmap)) { provider.notifyAddedToCache(); } } |