| Index: content/renderer/media/webmediaplayer_params.h
|
| diff --git a/content/renderer/media/webmediaplayer_params.h b/content/renderer/media/webmediaplayer_params.h
|
| index bf398642f7778b09e93ed90219cae608faa7d28e..9fa96e1af26b7dc1db1b3cfe68bfb526f00048ba 100644
|
| --- a/content/renderer/media/webmediaplayer_params.h
|
| +++ b/content/renderer/media/webmediaplayer_params.h
|
| @@ -8,14 +8,8 @@
|
| #include "base/callback.h"
|
| #include "base/memory/ref_counted.h"
|
|
|
| -namespace base {
|
| -class MessageLoopProxy;
|
| -}
|
| -
|
| namespace media {
|
| class AudioRendererSink;
|
| -class GpuVideoAcceleratorFactories;
|
| -class MediaLog;
|
| }
|
|
|
| namespace content {
|
| @@ -24,20 +18,12 @@ namespace content {
|
| // to plumb arguments through various abstraction layers.
|
| class WebMediaPlayerParams {
|
| public:
|
| - // |message_loop_proxy| and |media_log| are the only required parameters;
|
| - // all others may be null.
|
| + // Parameters may be null.
|
| WebMediaPlayerParams(
|
| - const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
|
| const base::Callback<void(const base::Closure&)>& defer_load_cb,
|
| - const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
|
| - const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories,
|
| - const scoped_refptr<media::MediaLog>& media_log);
|
| + const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink);
|
| ~WebMediaPlayerParams();
|
|
|
| - const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy() const {
|
| - return message_loop_proxy_;
|
| - }
|
| -
|
| base::Callback<void(const base::Closure&)> defer_load_cb() const {
|
| return defer_load_cb_;
|
| }
|
| @@ -46,21 +32,9 @@ class WebMediaPlayerParams {
|
| return audio_renderer_sink_;
|
| }
|
|
|
| - const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories()
|
| - const {
|
| - return gpu_factories_;
|
| - }
|
| -
|
| - const scoped_refptr<media::MediaLog>& media_log() const {
|
| - return media_log_;
|
| - }
|
| -
|
| private:
|
| - scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
|
| base::Callback<void(const base::Closure&)> defer_load_cb_;
|
| scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
|
| - scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
|
| - scoped_refptr<media::MediaLog> media_log_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
|
| };
|
|
|