| Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| index 2ae331b00706d1920c31c39e044b4f509953ce06..1e779ce666867a933c6f636d62170e6f0c4b5af0 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| @@ -127,21 +127,20 @@ class SynchronousCompositorFactoryImpl::VideoContextProvider
|
| context_provider_->BindToCurrentThread();
|
| }
|
|
|
| - virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
|
| + scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
|
| uint32 stream_id) override {
|
| return gl_in_process_context_->GetSurfaceTexture(stream_id);
|
| }
|
|
|
| - virtual gpu::gles2::GLES2Interface* ContextGL() override {
|
| + gpu::gles2::GLES2Interface* ContextGL() override {
|
| return context_provider_->ContextGL();
|
| }
|
|
|
| - virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override {
|
| + void AddObserver(StreamTextureFactoryContextObserver* obs) override {
|
| observer_list_.AddObserver(obs);
|
| }
|
|
|
| - virtual void RemoveObserver(
|
| - StreamTextureFactoryContextObserver* obs) override {
|
| + void RemoveObserver(StreamTextureFactoryContextObserver* obs) override {
|
| observer_list_.RemoveObserver(obs);
|
| }
|
|
|
| @@ -153,7 +152,7 @@ class SynchronousCompositorFactoryImpl::VideoContextProvider
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<VideoContextProvider>;
|
| - virtual ~VideoContextProvider() {}
|
| + ~VideoContextProvider() override {}
|
|
|
| scoped_refptr<cc::ContextProvider> context_provider_;
|
| gpu::GLInProcessContext* gl_in_process_context_;
|
|
|