webkit/renderer/media/webmediaplayer_impl.cc - Issue 17068010: Fix WebMediaPlayer build with enable_pepper_cdms=0

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: webkit/renderer/media/webmediaplayer_impl.cc

Issue 17068010: Fix WebMediaPlayer build with enable_pepper_cdms=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/renderer/media/webmediaplayer_impl.cc

diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc

index 550ddd022d847af6e7012eba0243636b40601342..25c9c5a870d2532042caf4d4b1cfeaf8aa84aa01 100644

--- a/webkit/renderer/media/webmediaplayer_impl.cc

+++ b/webkit/renderer/media/webmediaplayer_impl.cc

@@ -172,8 +172,10 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(

if (WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) {

decryptor_.reset(new ProxyDecryptor(

+#if defined(ENABLE_PEPPER_CDMS)

client,

frame,

+#endif

BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded),

BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError),

BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage)));

« no previous file with comments | « no previous file | no next file » | no next file with comments »