diff options
author | 2015-08-27 07:41:13 -0700 | |
---|---|---|
committer | 2015-08-27 07:41:16 -0700 | |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/gpu/effects/GrTextureStripAtlas.h | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/gpu/effects/GrTextureStripAtlas.h')
-rw-r--r-- | src/gpu/effects/GrTextureStripAtlas.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/effects/GrTextureStripAtlas.h b/src/gpu/effects/GrTextureStripAtlas.h index 98ac52a2d0..91ce61c232 100644 --- a/src/gpu/effects/GrTextureStripAtlas.h +++ b/src/gpu/effects/GrTextureStripAtlas.h @@ -83,7 +83,7 @@ private: * together to represent LRU status */ struct AtlasRow : SkNoncopyable { - AtlasRow() : fKey(kEmptyAtlasRowKey), fLocks(0), fNext(NULL), fPrev(NULL) { } + AtlasRow() : fKey(kEmptyAtlasRowKey), fLocks(0), fNext(nullptr), fPrev(nullptr) { } // GenerationID of the bitmap that is represented by this row, 0xffffffff means "empty" uint32_t fKey; // How many times this has been locked (0 == unlocked) @@ -107,7 +107,7 @@ private: void initLRU(); /** - * Grabs the least recently used free row out of the LRU list, returns NULL if no rows are free. + * Grabs the least recently used free row out of the LRU list, returns nullptr if no rows are free. */ AtlasRow* getLRU(); @@ -145,7 +145,7 @@ private: static uint32_t Hash(const Desc& desc) { return SkChecksum::Murmur3(&desc, sizeof(Desc)); } // AtlasEntry proper - AtlasEntry() : fAtlas(NULL) {} + AtlasEntry() : fAtlas(nullptr) {} ~AtlasEntry() { delete fAtlas; } Desc fDesc; GrTextureStripAtlas* fAtlas; |