| Index: content/renderer/media/android/stream_texture_factory_impl.h
|
| diff --git a/content/renderer/media/android/stream_texture_factory_impl.h b/content/renderer/media/android/stream_texture_factory_impl.h
|
| index 0374879a39aa0404f2f92fc57ab938112365094d..f39ba49565b82c0e43632f0bc1ba8ece7d04df9f 100644
|
| --- a/content/renderer/media/android/stream_texture_factory_impl.h
|
| +++ b/content/renderer/media/android/stream_texture_factory_impl.h
|
| @@ -19,18 +19,18 @@ class GLES2Interface;
|
|
|
| namespace content {
|
|
|
| +class ContextProviderCommandBuffer;
|
| class GpuChannelHost;
|
|
|
| class StreamTextureFactoryImpl : public StreamTextureFactory {
|
| public:
|
| static scoped_refptr<StreamTextureFactoryImpl> Create(
|
| - const scoped_refptr<cc::ContextProvider>& context_provider,
|
| - GpuChannelHost* channel,
|
| - int frame_id);
|
| + const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
|
| + GpuChannelHost* channel);
|
|
|
| // StreamTextureFactory implementation.
|
| StreamTextureProxy* CreateProxy() override;
|
| - void EstablishPeer(int32 stream_id, int player_id) override;
|
| + void EstablishPeer(int32 stream_id, int player_id, int frame_id) override;
|
| unsigned CreateStreamTexture(unsigned texture_target,
|
| unsigned* texture_id,
|
| gpu::Mailbox* texture_mailbox) override;
|
| @@ -42,14 +42,12 @@ class StreamTextureFactoryImpl : public StreamTextureFactory {
|
| private:
|
| friend class base::RefCounted<StreamTextureFactoryImpl>;
|
| StreamTextureFactoryImpl(
|
| - const scoped_refptr<cc::ContextProvider>& context_provider,
|
| - GpuChannelHost* channel,
|
| - int frame_id);
|
| + const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
|
| + GpuChannelHost* channel);
|
| ~StreamTextureFactoryImpl() override;
|
|
|
| - scoped_refptr<cc::ContextProvider> context_provider_;
|
| + scoped_refptr<content::ContextProviderCommandBuffer> context_provider_;
|
| scoped_refptr<GpuChannelHost> channel_;
|
| - int frame_id_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactoryImpl);
|
| };
|
|
|