Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: webkit/media/webmediaplayer_impl.h

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698