commit 49f085dddff10473b6ebf832a974288300224e60
author bsalomon <bsalomon@google.com> Fri Sep 05 13:34:00 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Sep 05 13:34:00 2014 -0700
tree 308a3cac5e1fb053c9e27e7d07213d72eaa05409
parent 7260d7292bde966f038b8e166f3fe41ddd8f2099

"NULL !=" = NULL

R=reed@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/544233002

src/gpu/GrResourceCache.cpp

diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
index 8a21002..e9be509 100644
--- a/src/gpu/GrResourceCache.cpp
+++ b/src/gpu/GrResourceCache.cpp
@@ -117,10 +117,10 @@
 }
 
 void GrResourceCache::getLimits(int* maxResources, size_t* maxResourceBytes) const{
-    if (NULL != maxResources) {
+    if (maxResources) {
         *maxResources = fMaxCount;
     }
-    if (NULL != maxResourceBytes) {
+    if (maxResourceBytes) {
         *maxResourceBytes = fMaxBytes;
     }
 }
@@ -343,7 +343,7 @@
     this->internalPurge(extraCount, extraBytes);
     if (((fEntryCount+extraCount) > fMaxCount ||
         (fEntryBytes+extraBytes) > fMaxBytes) &&
-        NULL != fOverbudgetCB) {
+        fOverbudgetCB) {
         // Despite the purge we're still over budget. See if Ganesh can
         // release some resources and purge again.
         if ((*fOverbudgetCB)(fOverbudgetData)) {
@@ -402,7 +402,7 @@
         // in internalDetach)
         GrResourceCacheEntry* entry = iter.init(fList, EntryList::Iter::kTail_IterStart);
 
-        while (NULL != entry) {
+        while (entry) {
             GrAutoResourceCacheValidate atcv(this);
 
             if ((fEntryCount+extraCount) <= fMaxCount &&
@@ -462,7 +462,7 @@
     const GrResourceCacheEntry* entry = iter.init(const_cast<EntryList&>(list),
                                                   EntryList::Iter::kTail_IterStart);
 
-    for ( ; NULL != entry; entry = iter.prev()) {
+    for ( ; entry; entry = iter.prev()) {
         bytes += entry->resource()->gpuMemorySize();
     }
     return bytes;
@@ -487,7 +487,7 @@
     const GrResourceCacheEntry* entry = iter.init(const_cast<EntryList&>(fExclusiveList),
                                                   EntryList::Iter::kHead_IterStart);
 
-    for ( ; NULL != entry; entry = iter.next()) {
+    for ( ; entry; entry = iter.next()) {
         entry->validate();
     }
 
@@ -495,7 +495,7 @@
     entry = iter.init(const_cast<EntryList&>(fList), EntryList::Iter::kHead_IterStart);
 
     int count = 0;
-    for ( ; NULL != entry; entry = iter.next()) {
+    for ( ; entry; entry = iter.next()) {
         entry->validate();
         SkASSERT(fCache.find(entry->key()));
         count += 1;
@@ -523,7 +523,7 @@
 
     GrResourceCacheEntry* entry = iter.init(fList, EntryList::Iter::kTail_IterStart);
 
-    for ( ; NULL != entry; entry = iter.prev()) {
+    for ( ; entry; entry = iter.prev()) {
         if (entry->fResource->getRefCnt() > 1) {
             ++locked;
         }