| Index: content/renderer/media/android/stream_texture_factory_synchronous_impl.h
|
| diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
|
| index 3f33bd39b1a7d06243ae51f28cdd6598e32e838b..1e2db8a539cc6bb0906052071fb3f8cbf75b595b 100644
|
| --- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
|
| +++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
|
| @@ -47,24 +47,22 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {
|
| const CreateContextProviderCallback& try_create_callback,
|
| int frame_id);
|
|
|
| - virtual StreamTextureProxy* CreateProxy() override;
|
| - virtual void EstablishPeer(int32 stream_id, int player_id) override;
|
| - virtual unsigned CreateStreamTexture(unsigned texture_target,
|
| - unsigned* texture_id,
|
| - gpu::Mailbox* texture_mailbox) override;
|
| - virtual void SetStreamTextureSize(int32 stream_id,
|
| - const gfx::Size& size) override;
|
| - virtual gpu::gles2::GLES2Interface* ContextGL() override;
|
| - virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override;
|
| - virtual void RemoveObserver(
|
| - StreamTextureFactoryContextObserver* obs) override;
|
| + StreamTextureProxy* CreateProxy() override;
|
| + void EstablishPeer(int32 stream_id, int player_id) override;
|
| + unsigned CreateStreamTexture(unsigned texture_target,
|
| + unsigned* texture_id,
|
| + gpu::Mailbox* texture_mailbox) override;
|
| + void SetStreamTextureSize(int32 stream_id, const gfx::Size& size) override;
|
| + gpu::gles2::GLES2Interface* ContextGL() override;
|
| + void AddObserver(StreamTextureFactoryContextObserver* obs) override;
|
| + void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;
|
|
|
| private:
|
| friend class base::RefCounted<StreamTextureFactorySynchronousImpl>;
|
| StreamTextureFactorySynchronousImpl(
|
| const CreateContextProviderCallback& try_create_callback,
|
| int frame_id);
|
| - virtual ~StreamTextureFactorySynchronousImpl();
|
| + ~StreamTextureFactorySynchronousImpl() override;
|
|
|
| CreateContextProviderCallback create_context_provider_callback_;
|
| scoped_refptr<ContextProvider> context_provider_;
|
|
|