From 026d70ba45832acac08d76ec962ec00dad2b9f82 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Mon, 19 Nov 2018 10:53:04 -0800 Subject: [PATCH] Do not use both "virtual" and "override". C++'s "override" keyword implies "virtual". When "virtual" and "override" are both specified it means something slightly different from just "override", which is what was intended here. I teach the C++11 class here at Google. I asked the C++ arbitors to help me understand this difference. They warned that it is dangerous and not worth knowing. But that it is worth avoiding. Test: Tested on local device -- no noticable change. BUG=115613038 Change-Id: I372821053755fc4cbb1d001b71af7f02dffde5b2 --- libs/hwui/pipeline/skia/GLFunctorDrawable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/hwui/pipeline/skia/GLFunctorDrawable.h b/libs/hwui/pipeline/skia/GLFunctorDrawable.h index dd6ef25f30c5b..b06f7f029f23a 100644 --- a/libs/hwui/pipeline/skia/GLFunctorDrawable.h +++ b/libs/hwui/pipeline/skia/GLFunctorDrawable.h @@ -38,7 +38,7 @@ public: void syncFunctor() const override; protected: - virtual void onDraw(SkCanvas* canvas) override; + void onDraw(SkCanvas* canvas) override; }; }; // namespace skiapipeline