Commit e608bf1d authored by dcheng's avatar dcheng Committed by Commit bot

Update {virtual,override,final} to follow C++11 style in gpu.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with an OS=android build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463

Review URL: https://codereview.chromium.org/871293003

Cr-Commit-Position: refs/heads/master@{#314998}
parent 0c5fb2d0
...@@ -68,7 +68,7 @@ class GLInProcessContextImpl ...@@ -68,7 +68,7 @@ class GLInProcessContextImpl
size_t GetMappedMemoryLimit() override; size_t GetMappedMemoryLimit() override;
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
uint32 stream_id) override; uint32 stream_id) override;
#endif #endif
......
...@@ -23,23 +23,23 @@ class GLImageImpl : public gfx::GLImage { ...@@ -23,23 +23,23 @@ class GLImageImpl : public gfx::GLImage {
const base::Closure& release_callback); const base::Closure& release_callback);
// implement gfx::GLImage // implement gfx::GLImage
virtual void Destroy(bool have_context) override; void Destroy(bool have_context) override;
virtual gfx::Size GetSize() override; gfx::Size GetSize() override;
virtual bool BindTexImage(unsigned target) override; bool BindTexImage(unsigned target) override;
virtual void ReleaseTexImage(unsigned target) override; void ReleaseTexImage(unsigned target) override;
virtual bool CopyTexImage(unsigned target) override; bool CopyTexImage(unsigned target) override;
virtual void WillUseTexImage() override; void WillUseTexImage() override;
virtual void DidUseTexImage() override {} void DidUseTexImage() override {}
virtual void WillModifyTexImage() override {} void WillModifyTexImage() override {}
virtual void DidModifyTexImage() override {} void DidModifyTexImage() override {}
virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order, int z_order,
gfx::OverlayTransform transform, gfx::OverlayTransform transform,
const gfx::Rect& bounds_rect, const gfx::Rect& bounds_rect,
const gfx::RectF& crop_rect) override; const gfx::RectF& crop_rect) override;
private: private:
virtual ~GLImageImpl(); ~GLImageImpl() override;
scoped_refptr<gfx::SurfaceTexture> surface_texture_; scoped_refptr<gfx::SurfaceTexture> surface_texture_;
base::Closure release_callback_; base::Closure release_callback_;
......
...@@ -22,13 +22,9 @@ namespace gpu { ...@@ -22,13 +22,9 @@ namespace gpu {
class GLSurfaceTextureTest : public testing::Test { class GLSurfaceTextureTest : public testing::Test {
protected: protected:
virtual void SetUp() override { void SetUp() override { gl_.Initialize(GLManager::Options()); }
gl_.Initialize(GLManager::Options());
}
virtual void TearDown() override { void TearDown() override { gl_.Destroy(); }
gl_.Destroy();
}
GLManager gl_; GLManager gl_;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment