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

Unified Diff: content/renderer/render_view_impl.cc

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: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 2765c0b83074ad59ef01922d589caf32683aff16..9bc5a2603d27f9eb376d063817b123ae0bb56f55 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2597,16 +2597,20 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
gpu_channel_host, factories_loop, context3d)));
}
+ bool encrypted_media_enabled =
+ cmd_line->HasSwitch(switches::kEnableEncryptedMedia);
+
WebMediaPlayer* media_player =
GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
this, frame, client, AsWeakPtr(), collection, audio_source_provider,
audio_source_provider, message_loop_factory, media_stream_impl_,
- render_media_log);
+ encrypted_media_enabled, render_media_log);
if (!media_player) {
+
media_player = new webkit_media::WebMediaPlayerImpl(
frame, client, AsWeakPtr(), collection, audio_source_provider,
audio_source_provider, message_loop_factory, media_stream_impl_,
- render_media_log);
+ encrypted_media_enabled, render_media_log);
}
return media_player;
}

Powered by Google App Engine
This is Rietveld 408576698