| Index: media/blink/webmediaplayer_params.h
|
| diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
|
| index 7bd3ddb71b9a76847544a8e5e1ab4619b96151ba..c765548d4b009b10b8ea77c98f4ea512be62ef54 100644
|
| --- a/media/blink/webmediaplayer_params.h
|
| +++ b/media/blink/webmediaplayer_params.h
|
| @@ -42,12 +42,11 @@ class MEDIA_EXPORT WebMediaPlayerParams {
|
| const AudioHardwareConfig& audio_hardware_config,
|
| const scoped_refptr<MediaLog>& media_log,
|
| const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
|
| - const scoped_refptr<base::SingleThreadTaskRunner>&
|
| - media_task_runner,
|
| - const scoped_refptr<base::SingleThreadTaskRunner>&
|
| - compositor_task_runner,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
|
| const EncryptedMediaPlayerSupportCreateCB&
|
| - encrypted_media_player_support_cb);
|
| + encrypted_media_player_support_cb,
|
| + blink::WebContentDecryptionModule* initial_cdm);
|
|
|
| ~WebMediaPlayerParams();
|
|
|
| @@ -94,6 +93,7 @@ class MEDIA_EXPORT WebMediaPlayerParams {
|
| scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
|
| EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_;
|
| + blink::WebContentDecryptionModule* initial_cdm_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
|
| };
|
|
|