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/Renderer.h | |
| parent | 07adacf4996c8ca494332ec938786fa15832c722 (diff) | |
| download | frameworks_base-e84a208317e0ed388fcdad1e6743c7849acb51b0.zip frameworks_base-e84a208317e0ed388fcdad1e6743c7849acb51b0.tar.gz frameworks_base-e84a208317e0ed388fcdad1e6743c7849acb51b0.tar.bz2 | |
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/Renderer.h')
| -rw-r--r-- | libs/hwui/Renderer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Renderer.h b/libs/hwui/Renderer.h index 2b7b567..ee44d7a 100644 --- a/libs/hwui/Renderer.h +++ b/libs/hwui/Renderer.h @@ -79,13 +79,13 @@ public: // TODO: move to a method on android:Paint static inline bool paintWillNotDrawText(const SkPaint& paint) { return paint.getAlpha() == 0 - && paint.getLooper() == NULL + && paint.getLooper() == nullptr && !paint.getColorFilter() && getXfermode(paint.getXfermode()) == SkXfermode::kSrcOver_Mode; } static bool isBlendedColorFilter(const SkColorFilter* filter) { - if (filter == NULL) { + if (filter == nullptr) { return false; } return (filter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag) == 0; |