| Index: media/blink/webmediaplayer_params.h
|
| diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
|
| index 2da0d23cb9fb745bb958aab3f334d7d64b9aab16..206d23f4a773f14f96cd606e054274fb05d2bfe1 100644
|
| --- a/media/blink/webmediaplayer_params.h
|
| +++ b/media/blink/webmediaplayer_params.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| +#include "media/base/media_log.h"
|
| #include "media/base/media_observer.h"
|
| #include "media/blink/media_blink_export.h"
|
| #include "media/filters/context_3d.h"
|
| @@ -28,7 +29,6 @@ class WebContentDecryptionModule;
|
| namespace media {
|
|
|
| class SwitchableAudioRendererSink;
|
| -class MediaLog;
|
| class SurfaceManager;
|
|
|
| // Holds parameters for constructing WebMediaPlayerImpl without having
|
| @@ -48,9 +48,9 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
|
| // |defer_load_cb|, |audio_renderer_sink|, |compositor_task_runner|, and
|
| // |context_3d_cb| may be null.
|
| WebMediaPlayerParams(
|
| + std::unique_ptr<MediaLog> media_log,
|
| const DeferLoadCB& defer_load_cb,
|
| const scoped_refptr<SwitchableAudioRendererSink>& audio_renderer_sink,
|
| - const scoped_refptr<MediaLog>& media_log,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| const scoped_refptr<base::TaskRunner>& worker_task_runner,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
|
| @@ -74,9 +74,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
|
| return audio_renderer_sink_;
|
| }
|
|
|
| - const scoped_refptr<MediaLog>& media_log() const {
|
| - return media_log_;
|
| - }
|
| + std::unique_ptr<MediaLog> take_media_log() { return std::move(media_log_); }
|
|
|
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner() const {
|
| return media_task_runner_;
|
| @@ -129,7 +127,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
|
| private:
|
| DeferLoadCB defer_load_cb_;
|
| scoped_refptr<SwitchableAudioRendererSink> audio_renderer_sink_;
|
| - scoped_refptr<MediaLog> media_log_;
|
| + std::unique_ptr<MediaLog> media_log_;
|
| scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
|
| scoped_refptr<base::TaskRunner> worker_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
|
|
|