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

Unified Diff: src/lazy/SkCachingPixelRef.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/images/bmpdecoderhelper.cpp ('k') | src/lazy/SkDiscardableMemoryPool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/lazy/SkCachingPixelRef.cpp
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp
index f65e5454a78977345476397257615d95ab4c94fc..692e4ea3d6715564545f1c93352771e5b095cc9a 100644
--- a/src/lazy/SkCachingPixelRef.cpp
+++ b/src/lazy/SkCachingPixelRef.cpp
@@ -11,8 +11,8 @@
bool SkCachingPixelRef::Install(SkImageGenerator* generator,
SkBitmap* dst) {
- SkASSERT(dst != NULL);
- if (NULL == generator) {
+ SkASSERT(dst != nullptr);
+ if (nullptr == generator) {
return false;
}
const SkImageInfo info = generator->getInfo();
@@ -32,7 +32,7 @@ SkCachingPixelRef::SkCachingPixelRef(const SkImageInfo& info,
, fImageGenerator(generator)
, fErrorInDecoding(false)
, fRowBytes(rowBytes) {
- SkASSERT(fImageGenerator != NULL);
+ SkASSERT(fImageGenerator != nullptr);
}
SkCachingPixelRef::~SkCachingPixelRef() {
delete fImageGenerator;
@@ -62,9 +62,9 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) {
// Now bitmap should contain a concrete PixelRef of the decoded image.
void* pixels = fLockedBitmap.getPixels();
- SkASSERT(pixels != NULL);
+ SkASSERT(pixels != nullptr);
rec->fPixels = pixels;
- rec->fColorTable = NULL;
+ rec->fColorTable = nullptr;
rec->fRowBytes = fLockedBitmap.rowBytes();
return true;
}
« no previous file with comments | « src/images/bmpdecoderhelper.cpp ('k') | src/lazy/SkDiscardableMemoryPool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698