Index: src/gpu/effects/GrTextureStripAtlas.h |
diff --git a/src/gpu/effects/GrTextureStripAtlas.h b/src/gpu/effects/GrTextureStripAtlas.h |
index 98ac52a2d0ec1b3d16db07c93dbf4f57dbd9aa9b..91ce61c23200e286f1b7df307d3808f408b23edd 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; |