| Index: webkit/media/webmediaplayer_impl.h
|
| diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
|
| index 6d541107f7bb45efeb2e7a46581461bc09465f6d..86039de90a99971e512c0c946fefbac05b056447 100644
|
| --- a/webkit/media/webmediaplayer_impl.h
|
| +++ b/webkit/media/webmediaplayer_impl.h
|
| @@ -120,6 +120,7 @@ class WebMediaPlayerImpl
|
| media::AudioRendererSink* audio_renderer_sink,
|
| media::MessageLoopFactory* message_loop_factory,
|
| MediaStreamClient* media_stream_client,
|
| + bool encrypted_media_enabled,
|
| media::MediaLog* media_log);
|
| virtual ~WebMediaPlayerImpl();
|
|
|
| @@ -359,7 +360,7 @@ class WebMediaPlayerImpl
|
| bool supports_save_;
|
|
|
| // The decryptor that manages decryption keys and decrypts encrypted frames.
|
| - ProxyDecryptor decryptor_;
|
| + scoped_ptr<ProxyDecryptor> decryptor_;
|
|
|
| bool starting_;
|
|
|
|
|