chrome/renderer/prerender/prerender_webmediaplayer.cc - Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/prerender/prerender_webmediaplayer.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

« no previous file with comments | « chrome/renderer/prerender/prerender_webmediaplayer.h ('k') | content/public/renderer/content_renderer_client.h » ('j') | webkit/media/webmediaplayer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/prerender/prerender_webmediaplayer.cc

diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.cc b/chrome/renderer/prerender/prerender_webmediaplayer.cc

index 54b6dd7eb0e949ce52a491a0aa191425ebd7ee9f..b63ef1b1a68bf6a6f9acbebb15a2a477614c3141 100644

--- a/chrome/renderer/prerender/prerender_webmediaplayer.cc

+++ b/chrome/renderer/prerender/prerender_webmediaplayer.cc

@@ -24,6 +24,7 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(

media::AudioRendererSink* audio_renderer_sink,

media::MessageLoopFactory* message_loop_factory,

webkit_media::MediaStreamClient* media_stream_client,

+ bool encrypted_media_enabled,

media::MediaLog* media_log)

: RenderViewObserver(render_view),

WebMediaPlayerImpl(frame,

@@ -34,6 +35,7 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(

audio_renderer_sink,

message_loop_factory,

media_stream_client,

+ encrypted_media_enabled,

media_log),

is_prerendering_(true),

url_loaded_(false),