| Index: content/renderer/media/android/renderer_demuxer_android.h
|
| diff --git a/content/renderer/media/android/renderer_demuxer_android.h b/content/renderer/media/android/renderer_demuxer_android.h
|
| index 52fbb0d90d084a4f23aa999844eca4e2c3030a4e..f6575faf89d8c443265f862049f92f103d1d9aa2 100644
|
| --- a/content/renderer/media/android/renderer_demuxer_android.h
|
| +++ b/content/renderer/media/android/renderer_demuxer_android.h
|
| @@ -7,19 +7,18 @@
|
|
|
| #include "base/atomic_sequence_num.h"
|
| #include "base/id_map.h"
|
| -#include "ipc/ipc_channel_proxy.h"
|
| +#include "content/child/child_message_filter.h"
|
| #include "media/base/android/demuxer_stream_player_params.h"
|
|
|
| namespace content {
|
|
|
| class MediaSourceDelegate;
|
| -class ThreadSafeSender;
|
|
|
| // Represents the renderer process half of an IPC-based implementation of
|
| // media::DemuxerAndroid.
|
| //
|
| // Refer to BrowserDemuxerAndroid for the browser process half.
|
| -class RendererDemuxerAndroid : public IPC::ChannelProxy::MessageFilter {
|
| +class RendererDemuxerAndroid : public ChildMessageFilter {
|
| public:
|
| RendererDemuxerAndroid();
|
|
|
| @@ -39,8 +38,10 @@ class RendererDemuxerAndroid : public IPC::ChannelProxy::MessageFilter {
|
| // Must be called on media thread.
|
| void RemoveDelegate(int demuxer_client_id);
|
|
|
| - // IPC::ChannelProxy::MessageFilter overrides.
|
| - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| + // ChildMessageFilter overrides.
|
| + virtual base::TaskRunner* OverrideTaskRunnerForMessage(
|
| + const IPC::Message& message) OVERRIDE;
|
| + virtual bool HandleMessage(const IPC::Message& message) OVERRIDE;
|
|
|
| // media::DemuxerAndroidClient "implementation".
|
| //
|
| @@ -59,7 +60,6 @@ class RendererDemuxerAndroid : public IPC::ChannelProxy::MessageFilter {
|
| virtual ~RendererDemuxerAndroid();
|
|
|
| private:
|
| - void DispatchMessage(const IPC::Message& message);
|
| void OnReadFromDemuxer(int demuxer_client_id,
|
| media::DemuxerStream::Type type);
|
| void OnDemuxerSeekRequest(int demuxer_client_id,
|
| @@ -69,7 +69,6 @@ class RendererDemuxerAndroid : public IPC::ChannelProxy::MessageFilter {
|
| base::AtomicSequenceNumber next_demuxer_client_id_;
|
|
|
| IDMap<MediaSourceDelegate> delegates_;
|
| - scoped_refptr<ThreadSafeSender> thread_safe_sender_;
|
| scoped_refptr<base::MessageLoopProxy> media_message_loop_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RendererDemuxerAndroid);
|
|
|