From d41c4d8c732095ae99c955b6b82f7306633004b1 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Mon, 5 Jan 2015 15:51:13 -0800 Subject: 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 --- libs/hwui/LayerRenderer.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'libs/hwui/LayerRenderer.h') diff --git a/libs/hwui/LayerRenderer.h b/libs/hwui/LayerRenderer.h index 769ef49..5e1e835 100644 --- a/libs/hwui/LayerRenderer.h +++ b/libs/hwui/LayerRenderer.h @@ -49,10 +49,11 @@ public: LayerRenderer(RenderState& renderState, Layer* layer); virtual ~LayerRenderer(); - virtual void onViewportInitialized() { /* do nothing */ } - virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque); - virtual void clear(float left, float top, float right, float bottom, bool opaque); - virtual bool finish(); + virtual void onViewportInitialized() override { /* do nothing */ } + virtual void prepareDirty(float left, float top, float right, float bottom, + bool opaque) override; + virtual void clear(float left, float top, float right, float bottom, bool opaque) override; + virtual bool finish() override; static Layer* createTextureLayer(RenderState& renderState); static Layer* createRenderLayer(RenderState& renderState, uint32_t width, uint32_t height); @@ -65,11 +66,11 @@ public: static void flushLayer(RenderState& renderState, Layer* layer); protected: - virtual void ensureStencilBuffer(); - virtual bool hasLayer() const; - virtual Region* getRegion() const; - virtual GLuint onGetTargetFbo() const; - virtual bool suppressErrorChecks() const; + virtual void ensureStencilBuffer() override; + virtual bool hasLayer() const override; + virtual Region* getRegion() const override; + virtual GLuint onGetTargetFbo() const override; + virtual bool suppressErrorChecks() const override; private: void generateMesh(); -- cgit v1.1