diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/lazy/SkDiscardableMemoryPool.cpp | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/lazy/SkDiscardableMemoryPool.cpp')
-rw-r--r-- | src/lazy/SkDiscardableMemoryPool.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp index 2da8335ff8..1f4836604d 100644 --- a/src/lazy/SkDiscardableMemoryPool.cpp +++ b/src/lazy/SkDiscardableMemoryPool.cpp @@ -32,19 +32,19 @@ public: DiscardableMemoryPool(size_t budget, SkBaseMutex* mutex = NULL); virtual ~DiscardableMemoryPool(); - SkDiscardableMemory* create(size_t bytes) SK_OVERRIDE; + SkDiscardableMemory* create(size_t bytes) override; - size_t getRAMUsed() SK_OVERRIDE; - void setRAMBudget(size_t budget) SK_OVERRIDE; - size_t getRAMBudget() SK_OVERRIDE { return fBudget; } + size_t getRAMUsed() override; + void setRAMBudget(size_t budget) override; + size_t getRAMBudget() override { return fBudget; } /** purges all unlocked DMs */ - void dumpPool() SK_OVERRIDE; + void dumpPool() override; #if SK_LAZY_CACHE_STATS // Defined in SkDiscardableMemoryPool.h - int getCacheHits() SK_OVERRIDE { return fCacheHits; } - int getCacheMisses() SK_OVERRIDE { return fCacheMisses; } - void resetCacheHitsAndMisses() SK_OVERRIDE { + int getCacheHits() override { return fCacheHits; } + int getCacheMisses() override { return fCacheMisses; } + void resetCacheHitsAndMisses() override { fCacheHits = fCacheMisses = 0; } int fCacheHits; @@ -80,9 +80,9 @@ public: PoolDiscardableMemory(DiscardableMemoryPool* pool, void* pointer, size_t bytes); virtual ~PoolDiscardableMemory(); - bool lock() SK_OVERRIDE; - void* data() SK_OVERRIDE; - void unlock() SK_OVERRIDE; + bool lock() override; + void* data() override; + void unlock() override; friend class DiscardableMemoryPool; private: SK_DECLARE_INTERNAL_LLIST_INTERFACE(PoolDiscardableMemory); |