From 9f4b0ae91e1875831cc11f0629b5db998ad85438 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 24 Mar 2017 17:00:17 -0400 Subject: 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 --- src/core/SkBitmapController.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/SkBitmapController.cpp') 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(); } } -- cgit v1.2.3