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

Unified Diff: src/effects/gradients/SkGradientBitmapCache.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/effects/SkXfermodeImageFilter.cpp ('k') | src/effects/gradients/SkGradientShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/gradients/SkGradientBitmapCache.cpp
diff --git a/src/effects/gradients/SkGradientBitmapCache.cpp b/src/effects/gradients/SkGradientBitmapCache.cpp
index 90fa3d54adfb57a53ba0cedcd5c9898989514771..24e7f5816b35e0bcee25a2f542f90133af415f27 100644
--- a/src/effects/gradients/SkGradientBitmapCache.cpp
+++ b/src/effects/gradients/SkGradientBitmapCache.cpp
@@ -18,8 +18,8 @@ struct SkGradientBitmapCache::Entry {
SkBitmap fBitmap;
Entry(const void* buffer, size_t size, const SkBitmap& bm)
- : fPrev(NULL),
- fNext(NULL),
+ : fPrev(nullptr),
+ fNext(nullptr),
fBitmap(bm) {
fBuffer = sk_malloc_throw(size);
fSize = size;
@@ -35,7 +35,7 @@ struct SkGradientBitmapCache::Entry {
SkGradientBitmapCache::SkGradientBitmapCache(int max) : fMaxEntries(max) {
fEntryCount = 0;
- fHead = fTail = NULL;
+ fHead = fTail = nullptr;
this->validate();
}
@@ -70,7 +70,7 @@ SkGradientBitmapCache::Entry* SkGradientBitmapCache::detach(Entry* entry) const
}
void SkGradientBitmapCache::attachToHead(Entry* entry) const {
- entry->fPrev = NULL;
+ entry->fPrev = nullptr;
entry->fNext = fHead;
if (fHead) {
fHead->fPrev = entry;
@@ -121,8 +121,8 @@ void SkGradientBitmapCache::validate() const {
SkASSERT(fEntryCount >= 0 && fEntryCount <= fMaxEntries);
if (fEntryCount > 0) {
- SkASSERT(NULL == fHead->fPrev);
- SkASSERT(NULL == fTail->fNext);
+ SkASSERT(nullptr == fHead->fPrev);
+ SkASSERT(nullptr == fTail->fNext);
if (fEntryCount == 1) {
SkASSERT(fHead == fTail);
@@ -145,8 +145,8 @@ void SkGradientBitmapCache::validate() const {
}
SkASSERT(0 == count);
} else {
- SkASSERT(NULL == fHead);
- SkASSERT(NULL == fTail);
+ SkASSERT(nullptr == fHead);
+ SkASSERT(nullptr == fTail);
}
}
« no previous file with comments | « src/effects/SkXfermodeImageFilter.cpp ('k') | src/effects/gradients/SkGradientShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698