| Index: src/core/SkImageFilter.cpp
|
| diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
|
| index 64603b4cb5244b423ccdf32c28c7b7bd7519a617..8402a55a224510ee6782619332e8a6d96e39ae72 100644
|
| --- a/src/core/SkImageFilter.cpp
|
| +++ b/src/core/SkImageFilter.cpp
|
| @@ -361,10 +361,7 @@ static uint32_t compute_hash(const uint32_t* data, int count) {
|
|
|
| class CacheImpl : public SkImageFilter::Cache {
|
| public:
|
| - explicit CacheImpl(int minChildren) : fMinChildren(minChildren) {
|
| - SkASSERT(fMinChildren <= 2);
|
| - }
|
| -
|
| + explicit CacheImpl(int minChildren) : fMinChildren(minChildren) {}
|
| virtual ~CacheImpl();
|
| bool get(const SkImageFilter* key, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
|
| void set(const SkImageFilter* key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE;
|
| @@ -407,10 +404,7 @@ void CacheImpl::remove(const SkImageFilter* key) {
|
| }
|
|
|
| void CacheImpl::set(const SkImageFilter* key, const SkBitmap& result, const SkIPoint& offset) {
|
| - if (fMinChildren < 2 || !key->unique()) {
|
| - // We take !key->unique() as a signal that there are probably at least 2 refs on the key,
|
| - // meaning this filter probably has at least two children and is worth caching when
|
| - // fMinChildren is 2. If fMinChildren is less than two, we'll just always cache.
|
| + if (key->getRefCnt() >= fMinChildren) {
|
| fData.add(new Value(key, result, offset));
|
| }
|
| }
|
|
|