diff options
author | dcheng <dcheng@chromium.org> | 2014-10-21 09:21:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 16:22:18 +0000 |
commit | 1f4d1d7fb990754e14b53dd67dccdeb6b98ef719 (patch) | |
tree | 93d40e76825ef68b53b8e2af2e20cc62829ea384 /gpu/command_buffer/tests | |
parent | f93bb58024cffd2b08e691f43138d789641708cb (diff) | |
download | chromium_src-1f4d1d7fb990754e14b53dd67dccdeb6b98ef719.zip chromium_src-1f4d1d7fb990754e14b53dd67dccdeb6b98ef719.tar.gz chromium_src-1f4d1d7fb990754e14b53dd67dccdeb6b98ef719.tar.bz2 |
Standardize usage of virtual/override/final in gpu/
This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.
The generator for the GLES2 command buffers has also been updated.
BUG=417463
TBR=piman@chromium.org
Review URL: https://codereview.chromium.org/663363002
Cr-Commit-Position: refs/heads/master@{#300496}
Diffstat (limited to 'gpu/command_buffer/tests')
-rw-r--r-- | gpu/command_buffer/tests/gl_manager.cc | 14 | ||||
-rw-r--r-- | gpu/command_buffer/tests/gl_manager.h | 39 |
2 files changed, 26 insertions, 27 deletions
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc index 5678778..bb2acbd 100644 --- a/gpu/command_buffer/tests/gl_manager.cc +++ b/gpu/command_buffer/tests/gl_manager.cc @@ -62,21 +62,21 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { } // Overridden from gfx::GpuMemoryBuffer: - virtual void* Map() override { + void* Map() override { mapped_ = true; return &bytes_->data().front(); } - virtual void Unmap() override { mapped_ = false; } - virtual bool IsMapped() const override { return mapped_; } - virtual Format GetFormat() const override { return format_; } - virtual uint32 GetStride() const override { + void Unmap() override { mapped_ = false; } + bool IsMapped() const override { return mapped_; } + Format GetFormat() const override { return format_; } + uint32 GetStride() const override { return size_.width() * BytesPerPixel(format_); } - virtual gfx::GpuMemoryBufferHandle GetHandle() const override { + gfx::GpuMemoryBufferHandle GetHandle() const override { NOTREACHED(); return gfx::GpuMemoryBufferHandle(); } - virtual ClientBuffer AsClientBuffer() override { + ClientBuffer AsClientBuffer() override { return reinterpret_cast<ClientBuffer>(this); } diff --git a/gpu/command_buffer/tests/gl_manager.h b/gpu/command_buffer/tests/gl_manager.h index d76ca5b..03ed6a1 100644 --- a/gpu/command_buffer/tests/gl_manager.h +++ b/gpu/command_buffer/tests/gl_manager.h @@ -59,7 +59,7 @@ class GLManager : private GpuControl { bool context_lost_allowed; }; GLManager(); - virtual ~GLManager(); + ~GLManager() override; static scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer( const gfx::Size& size, @@ -95,25 +95,24 @@ class GLManager : private GpuControl { const gpu::gles2::FeatureInfo::Workarounds& workarounds() const; // GpuControl implementation. - virtual Capabilities GetCapabilities() override; - virtual int32 CreateImage(ClientBuffer buffer, - size_t width, - size_t height, - unsigned internalformat) override; - virtual void DestroyImage(int32 id) override; - virtual int32 CreateGpuMemoryBufferImage(size_t width, - size_t height, - unsigned internalformat, - unsigned usage) override; - virtual uint32 InsertSyncPoint() override; - virtual uint32 InsertFutureSyncPoint() override; - virtual void RetireSyncPoint(uint32 sync_point) override; - virtual void SignalSyncPoint(uint32 sync_point, - const base::Closure& callback) override; - virtual void SignalQuery(uint32 query, - const base::Closure& callback) override; - virtual void SetSurfaceVisible(bool visible) override; - virtual uint32 CreateStreamTexture(uint32 texture_id) override; + Capabilities GetCapabilities() override; + int32 CreateImage(ClientBuffer buffer, + size_t width, + size_t height, + unsigned internalformat) override; + void DestroyImage(int32 id) override; + int32 CreateGpuMemoryBufferImage(size_t width, + size_t height, + unsigned internalformat, + unsigned usage) override; + uint32 InsertSyncPoint() override; + uint32 InsertFutureSyncPoint() override; + void RetireSyncPoint(uint32 sync_point) override; + void SignalSyncPoint(uint32 sync_point, + const base::Closure& callback) override; + void SignalQuery(uint32 query, const base::Closure& callback) override; + void SetSurfaceVisible(bool visible) override; + uint32 CreateStreamTexture(uint32 texture_id) override; private: void PumpCommands(); |