diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/core/SkResourceCache.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/core/SkResourceCache.h')
-rw-r--r-- | src/core/SkResourceCache.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkResourceCache.h b/src/core/SkResourceCache.h index 7267c6739b..813e2ee185 100644 --- a/src/core/SkResourceCache.h +++ b/src/core/SkResourceCache.h @@ -79,7 +79,7 @@ public: // for memory usage diagnostics virtual const char* getCategory() const = 0; - virtual SkDiscardableMemory* diagnostic_only_getDiscardable() const { return NULL; } + virtual SkDiscardableMemory* diagnostic_only_getDiscardable() const { return nullptr; } // for SkTDynamicHash::Traits static uint32_t Hash(const Key& key) { return key.hash(); } @@ -115,7 +115,7 @@ public: /** * Returns a locked/pinned SkDiscardableMemory instance for the specified - * number of bytes, or NULL on failure. + * number of bytes, or nullptr on failure. */ typedef SkDiscardableMemory* (*DiscardableFactory)(size_t bytes); @@ -153,13 +153,13 @@ public: static void TestDumpMemoryStatistics(); /** - * Returns the DiscardableFactory used by the global cache, or NULL. + * Returns the DiscardableFactory used by the global cache, or nullptr. */ static DiscardableFactory GetDiscardableFactory(); /** * Use this allocator for bitmaps, so they can use ashmem when available. - * Returns NULL if the ResourceCache has not been initialized with a DiscardableFactory. + * Returns nullptr if the ResourceCache has not been initialized with a DiscardableFactory. */ static SkBitmap::Allocator* GetAllocator(); @@ -250,7 +250,7 @@ private: Hash* fHash; DiscardableFactory fDiscardableFactory; - // the allocator is NULL or one that matches discardables + // the allocator is nullptr or one that matches discardables SkBitmap::Allocator* fAllocator; size_t fTotalBytesUsed; |