diff options
author | Chris Craik <ccraik@google.com> | 2015-01-05 15:51:13 -0800 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2015-01-05 16:49:13 -0800 |
commit | d41c4d8c732095ae99c955b6b82f7306633004b1 (patch) | |
tree | dbb2e26c6c5a80c7ccf43e5cd5fb1554cc603555 /libs/hwui/tests | |
parent | 8dfaa4904205772cdceee63ef3989bcdedf1a914 (diff) | |
download | frameworks_base-d41c4d8c732095ae99c955b6b82f7306633004b1.zip frameworks_base-d41c4d8c732095ae99c955b6b82f7306633004b1.tar.gz frameworks_base-d41c4d8c732095ae99c955b6b82f7306633004b1.tar.bz2 |
Add overrides and switch to nullptr keyword for all files
Adds remaining missing overrides and nullptr usages, missed due to
an extreme failure in tool usage.
Change-Id: I56abd72975a3999ad13330003c348db40f59aebf
Diffstat (limited to 'libs/hwui/tests')
-rw-r--r-- | libs/hwui/tests/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp index 4efef6f..152e7b2 100644 --- a/libs/hwui/tests/main.cpp +++ b/libs/hwui/tests/main.cpp @@ -33,7 +33,7 @@ using namespace android::uirenderer::renderthread; class ContextFactory : public IContextFactory { public: - virtual AnimationContext* createAnimationContext(renderthread::TimeLord& clock) { + virtual AnimationContext* createAnimationContext(renderthread::TimeLord& clock) override { return new AnimationContext(clock); } }; @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) { sp<Surface> surface = control->getSurface(); RenderNode* rootNode = new RenderNode(); - rootNode->incStrong(0); + rootNode->incStrong(nullptr); rootNode->mutateStagingProperties().setLeftTopRightBottom(0, 0, width, height); rootNode->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y); rootNode->mutateStagingProperties().setClipToBounds(false); @@ -123,7 +123,7 @@ int main(int argc, char* argv[]) { sleep(5); - rootNode->decStrong(0); + rootNode->decStrong(nullptr); printf("Success!\n"); return 0; |