diff options
author | dcheng <dcheng@chromium.org> | 2015-02-04 13:48:48 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-04 21:50:38 +0000 |
commit | 4d4461f988b4f0a5c84e0ae4852c23fbbc2769fc (patch) | |
tree | d780add23333b30ae7c4d0405c02044f6e0fb184 /content/common/gpu | |
parent | 517bbfa5e262d37dffdfa3d3fa77bbfeefb34adc (diff) | |
download | chromium_src-4d4461f988b4f0a5c84e0ae4852c23fbbc2769fc.zip chromium_src-4d4461f988b4f0a5c84e0ae4852c23fbbc2769fc.tar.gz chromium_src-4d4461f988b4f0a5c84e0ae4852c23fbbc2769fc.tar.bz2 |
Update {virtual,override,final} to follow C++11 style.
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
R=creis@chromium.org
Review URL: https://codereview.chromium.org/893333004
Cr-Commit-Position: refs/heads/master@{#314647}
Diffstat (limited to 'content/common/gpu')
6 files changed, 59 insertions, 63 deletions
diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h index fe47f69..24679b0 100644 --- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h +++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h @@ -24,7 +24,7 @@ class GpuMemoryBufferFactorySurfaceTexture : public GpuMemoryBufferFactory, public gpu::ImageFactory { public: GpuMemoryBufferFactorySurfaceTexture(); - ~GpuMemoryBufferFactorySurfaceTexture(); + ~GpuMemoryBufferFactorySurfaceTexture() override; static bool IsGpuMemoryBufferConfigurationSupported( gfx::GpuMemoryBuffer::Format format, diff --git a/content/common/gpu/image_transport_surface_android.cc b/content/common/gpu/image_transport_surface_android.cc index a2cadd0..6d67df2 100644 --- a/content/common/gpu/image_transport_surface_android.cc +++ b/content/common/gpu/image_transport_surface_android.cc @@ -39,11 +39,11 @@ class ImageTransportSurfaceAndroid const gfx::GLSurfaceHandle& handle); // gfx::GLSurface implementation. - virtual bool OnMakeCurrent(gfx::GLContext* context) override; - virtual void WakeUpGpu() override; + bool OnMakeCurrent(gfx::GLContext* context) override; + void WakeUpGpu() override; protected: - virtual ~ImageTransportSurfaceAndroid(); + ~ImageTransportSurfaceAndroid() override; private: void ScheduleWakeUp(); @@ -59,10 +59,10 @@ class DirectSurfaceAndroid : public PassThroughImageTransportSurface { gfx::GLSurface* surface); // gfx::GLSurface implementation. - virtual bool SwapBuffers() override; + bool SwapBuffers() override; protected: - virtual ~DirectSurfaceAndroid(); + ~DirectSurfaceAndroid() override; private: DISALLOW_COPY_AND_ASSIGN(DirectSurfaceAndroid); diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/content/common/gpu/media/android_video_decode_accelerator.h index 2b41925..ae299c8 100644 --- a/content/common/gpu/media/android_video_decode_accelerator.h +++ b/content/common/gpu/media/android_video_decode_accelerator.h @@ -37,16 +37,15 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator const base::Callback<bool(void)>& make_context_current); // media::VideoDecodeAccelerator implementation. - virtual bool Initialize(media::VideoCodecProfile profile, - Client* client) override; - virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) override; - virtual void AssignPictureBuffers( + bool Initialize(media::VideoCodecProfile profile, Client* client) override; + void Decode(const media::BitstreamBuffer& bitstream_buffer) override; + void AssignPictureBuffers( const std::vector<media::PictureBuffer>& buffers) override; - virtual void ReusePictureBuffer(int32 picture_buffer_id) override; - virtual void Flush() override; - virtual void Reset() override; - virtual void Destroy() override; - virtual bool CanDecodeOnIOThread() override; + void ReusePictureBuffer(int32 picture_buffer_id) override; + void Flush() override; + void Reset() override; + void Destroy() override; + bool CanDecodeOnIOThread() override; private: enum State { @@ -56,7 +55,7 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator static const base::TimeDelta kDecodePollDelay; - virtual ~AndroidVideoDecodeAccelerator(); + ~AndroidVideoDecodeAccelerator() override; // Configures |media_codec_| with the given codec parameters from the client. bool ConfigureMediaCodec(); diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc index e391d11..efd5b75 100644 --- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc @@ -33,29 +33,27 @@ namespace content { class MockVideoDecodeAcceleratorClient : public media::VideoDecodeAccelerator::Client { public: - MockVideoDecodeAcceleratorClient() {}; - virtual ~MockVideoDecodeAcceleratorClient() {}; + MockVideoDecodeAcceleratorClient() {} + ~MockVideoDecodeAcceleratorClient() override {} // VideoDecodeAccelerator::Client implementation. - virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, - const gfx::Size& dimensions, - uint32 texture_target) override {}; - virtual void DismissPictureBuffer(int32 picture_buffer_id) override {}; - virtual void PictureReady(const media::Picture& picture) override {}; - virtual void NotifyEndOfBitstreamBuffer( - int32 bitstream_buffer_id) override {}; - virtual void NotifyFlushDone() override {}; - virtual void NotifyResetDone() override {}; - virtual void NotifyError( - media::VideoDecodeAccelerator::Error error) override {}; + void ProvidePictureBuffers(uint32 requested_num_of_buffers, + const gfx::Size& dimensions, + uint32 texture_target) override {} + void DismissPictureBuffer(int32 picture_buffer_id) override {} + void PictureReady(const media::Picture& picture) override {} + void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override {} + void NotifyFlushDone() override {} + void NotifyResetDone() override {} + void NotifyError(media::VideoDecodeAccelerator::Error error) override {} }; class AndroidVideoDecodeAcceleratorTest : public testing::Test { public: - virtual ~AndroidVideoDecodeAcceleratorTest() {} + ~AndroidVideoDecodeAcceleratorTest() override {} protected: - virtual void SetUp() override { + void SetUp() override { JNIEnv* env = base::android::AttachCurrentThread(); media::RegisterJni(env); // TODO(felipeg): fix GL bindings, so that the decoder can perform GL diff --git a/content/common/gpu/media/android_video_encode_accelerator.h b/content/common/gpu/media/android_video_encode_accelerator.h index a587f10..7f2f4c0 100644 --- a/content/common/gpu/media/android_video_encode_accelerator.h +++ b/content/common/gpu/media/android_video_encode_accelerator.h @@ -32,23 +32,22 @@ class CONTENT_EXPORT AndroidVideoEncodeAccelerator : public media::VideoEncodeAccelerator { public: AndroidVideoEncodeAccelerator(); - virtual ~AndroidVideoEncodeAccelerator(); + ~AndroidVideoEncodeAccelerator() override; // media::VideoEncodeAccelerator implementation. - virtual std::vector<media::VideoEncodeAccelerator::SupportedProfile> - GetSupportedProfiles() override; - virtual bool Initialize(media::VideoFrame::Format format, - const gfx::Size& input_visible_size, - media::VideoCodecProfile output_profile, - uint32 initial_bitrate, - Client* client) override; - virtual void Encode(const scoped_refptr<media::VideoFrame>& frame, - bool force_keyframe) override; - virtual void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) - override; - virtual void RequestEncodingParametersChange(uint32 bitrate, - uint32 framerate) override; - virtual void Destroy() override; + std::vector<media::VideoEncodeAccelerator::SupportedProfile> + GetSupportedProfiles() override; + bool Initialize(media::VideoFrame::Format format, + const gfx::Size& input_visible_size, + media::VideoCodecProfile output_profile, + uint32 initial_bitrate, + Client* client) override; + void Encode(const scoped_refptr<media::VideoFrame>& frame, + bool force_keyframe) override; + void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) override; + void RequestEncodingParametersChange(uint32 bitrate, + uint32 framerate) override; + void Destroy() override; private: enum { diff --git a/content/common/gpu/stream_texture_android.h b/content/common/gpu/stream_texture_android.h index 066d4fa..72e4ed4 100644 --- a/content/common/gpu/stream_texture_android.h +++ b/content/common/gpu/stream_texture_android.h @@ -30,32 +30,32 @@ class StreamTexture : public gfx::GLImage, StreamTexture(GpuCommandBufferStub* owner_stub, int32 route_id, uint32 texture_id); - virtual ~StreamTexture(); + ~StreamTexture() override; // gfx::GLImage implementation: - virtual void Destroy(bool have_context) override; - virtual gfx::Size GetSize() override; - virtual bool BindTexImage(unsigned target) override; - virtual void ReleaseTexImage(unsigned target) override; - virtual bool CopyTexImage(unsigned target) override; - virtual void WillUseTexImage() override; - virtual void DidUseTexImage() override {} - virtual void WillModifyTexImage() override {} - virtual void DidModifyTexImage() override {} - virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, - int z_order, - gfx::OverlayTransform transform, - const gfx::Rect& bounds_rect, - const gfx::RectF& crop_rect) override; + void Destroy(bool have_context) override; + gfx::Size GetSize() override; + bool BindTexImage(unsigned target) override; + void ReleaseTexImage(unsigned target) override; + bool CopyTexImage(unsigned target) override; + void WillUseTexImage() override; + void DidUseTexImage() override {} + void WillModifyTexImage() override {} + void DidModifyTexImage() override {} + bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, + int z_order, + gfx::OverlayTransform transform, + const gfx::Rect& bounds_rect, + const gfx::RectF& crop_rect) override; // GpuCommandBufferStub::DestructionObserver implementation. - virtual void OnWillDestroyStub() override; + void OnWillDestroyStub() override; // Called when a new frame is available for the SurfaceTexture. void OnFrameAvailable(); // IPC::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // IPC message handlers: void OnStartListening(); |