| Index: src/core/SkResourceCache.cpp
|
| diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
|
| index 7ffdfffbaf25881276e64ddd5e5c9dfbce3da1bb..73f788cd172a7ac1e6e049a5ce246d2fff92eb64 100644
|
| --- a/src/core/SkResourceCache.cpp
|
| +++ b/src/core/SkResourceCache.cpp
|
| @@ -222,7 +222,7 @@ const SkResourceCache::Rec* SkResourceCache::addAndLock(Rec* rec) {
|
| SkASSERT(rec);
|
| // See if we already have this key (racy inserts, etc.)
|
| const Rec* existing = this->findAndLock(rec->getKey());
|
| - if (NULL != existing) {
|
| + if (existing) {
|
| SkDELETE(rec);
|
| return existing;
|
| }
|
| @@ -242,7 +242,7 @@ void SkResourceCache::add(Rec* rec) {
|
| SkASSERT(rec);
|
| // See if we already have this key (racy inserts, etc.)
|
| const Rec* existing = this->findAndLock(rec->getKey());
|
| - if (NULL != existing) {
|
| + if (existing) {
|
| SkDELETE(rec);
|
| this->unlock(existing);
|
| return;
|
| @@ -414,9 +414,9 @@ void SkResourceCache::validate() const {
|
| }
|
|
|
| SkASSERT(NULL == fHead->fPrev);
|
| - SkASSERT(NULL != fHead->fNext);
|
| + SkASSERT(fHead->fNext);
|
| SkASSERT(NULL == fTail->fNext);
|
| - SkASSERT(NULL != fTail->fPrev);
|
| + SkASSERT(fTail->fPrev);
|
|
|
| size_t used = 0;
|
| int count = 0;
|
|
|