diff options
author | Chris Craik <ccraik@google.com> | 2014-12-22 14:28:49 -0800 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2014-12-22 14:56:08 -0800 |
commit | e84a208317e0ed388fcdad1e6743c7849acb51b0 (patch) | |
tree | 8c057e6b6367a85790c30a118e6c8789c6bdf538 /libs/hwui/PathCache.h | |
parent | 07adacf4996c8ca494332ec938786fa15832c722 (diff) |
Add overrides and switch to nullptr keyword
Changes generated with clang-modernize.
Additionally, fixed some struct-vs-class usage to make clang happy.
Change-Id: Ic6ef2427401ff1e794d26f21f7b44868fc75fb72
Diffstat (limited to 'libs/hwui/PathCache.h')
-rw-r--r-- | libs/hwui/PathCache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/PathCache.h b/libs/hwui/PathCache.h index b0f00c702c44..ecd3712ce6eb 100644 --- a/libs/hwui/PathCache.h +++ b/libs/hwui/PathCache.h @@ -87,7 +87,7 @@ struct PathTexture: public Texture { } void clearTask() { - if (mTask != NULL) { + if (mTask != nullptr) { mTask.clear(); } } @@ -165,7 +165,7 @@ public: * Used as a callback when an entry is removed from the cache. * Do not invoke directly. */ - void operator()(PathDescription& path, PathTexture*& texture); + void operator()(PathDescription& path, PathTexture*& texture) override; /** * Clears the cache. This causes all textures to be deleted. @@ -292,7 +292,7 @@ private: PathProcessor(Caches& caches); ~PathProcessor() { } - virtual void onProcess(const sp<Task<SkBitmap*> >& task); + virtual void onProcess(const sp<Task<SkBitmap*> >& task) override; private: uint32_t mMaxTextureSize; |