Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1712)

Unified Diff: src/gpu/effects/GrTextureStripAtlas.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/effects/GrConvolutionEffect.cpp ('k') | src/gpu/gl/GrGLBufferImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrTextureStripAtlas.cpp
diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp
index e3927c0d1f097853ca18ba9c405c1b5c632b4f67..91df897eb82708f68da15f1122478362a2a804b3 100644
--- a/src/gpu/effects/GrTextureStripAtlas.cpp
+++ b/src/gpu/effects/GrTextureStripAtlas.cpp
@@ -35,7 +35,7 @@ GrTextureStripAtlas::Hash* GrTextureStripAtlas::GetCache() {
// Remove the specified atlas from the cache
void GrTextureStripAtlas::CleanUp(const GrContext*, void* info) {
- SkASSERT(NULL != info);
+ SkASSERT(info);
AtlasEntry* entry = static_cast<AtlasEntry*>(info);
@@ -209,11 +209,11 @@ void GrTextureStripAtlas::lockTexture() {
this->initLRU();
fKeyTable.rewind();
}
- SkASSERT(NULL != fTexture);
+ SkASSERT(fTexture);
}
void GrTextureStripAtlas::unlockTexture() {
- SkASSERT(NULL != fTexture && 0 == fLockedRows);
+ SkASSERT(fTexture && 0 == fLockedRows);
fTexture->unref();
fTexture = NULL;
fDesc.fContext->purgeCache();
@@ -246,8 +246,8 @@ void GrTextureStripAtlas::appendLRU(AtlasRow* row) {
}
void GrTextureStripAtlas::removeFromLRU(AtlasRow* row) {
- SkASSERT(NULL != row);
- if (NULL != row->fNext && NULL != row->fPrev) {
+ SkASSERT(row);
+ if (row->fNext && row->fPrev) {
row->fPrev->fNext = row->fNext;
row->fNext->fPrev = row->fPrev;
} else {
@@ -342,7 +342,7 @@ void GrTextureStripAtlas::validate() {
if (fLockedRows == 0) {
SkASSERT(NULL == fTexture);
} else {
- SkASSERT(NULL != fTexture);
+ SkASSERT(fTexture);
}
}
#endif
« no previous file with comments | « src/gpu/effects/GrConvolutionEffect.cpp ('k') | src/gpu/gl/GrGLBufferImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698