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

Unified Diff: src/core/SkCachedData.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 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/core/SkCachedData.h ('k') | src/core/SkCanvas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkCachedData.cpp
diff --git a/src/core/SkCachedData.cpp b/src/core/SkCachedData.cpp
index 439c2ffe05274c74e865cf2ec519738094807d9c..cfa4c6165f69a0e8df791f623ad3efcd457cd7d5 100644
--- a/src/core/SkCachedData.cpp
+++ b/src/core/SkCachedData.cpp
@@ -151,7 +151,7 @@ void SkCachedData::inMutexLock() {
SkASSERT(ptr);
this->setData(ptr);
} else {
- this->setData(NULL); // signal failure to lock, contents are gone
+ this->setData(nullptr); // signal failure to lock, contents are gone
}
break;
}
@@ -173,7 +173,7 @@ void SkCachedData::inMutexUnlock() {
}
break;
}
- this->setData(NULL); // signal that we're in an unlocked state
+ this->setData(nullptr); // signal that we're in an unlocked state
}
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -192,7 +192,7 @@ void SkCachedData::validate() const {
}
} else {
SkASSERT((fInCache && 1 == fRefCnt) || (0 == fRefCnt));
- SkASSERT(NULL == fData);
+ SkASSERT(nullptr == fData);
}
}
#endif
« no previous file with comments | « src/core/SkCachedData.h ('k') | src/core/SkCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698