content/renderer/media/webmediaplayer_impl.cc - Issue 193523002: Encrypted Media: Implement IPC based SetCdm().

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

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only Created 6 years, 9 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: content/renderer/media/webmediaplayer_impl.cc

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

index dbe3924d3445509e0bbde6fda6eaee9f7f145634..711245bff6b437f3933caa6a02dc887e5489ca7e 100644

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

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

@@ -1306,7 +1306,7 @@ void WebMediaPlayerImpl::SetDecryptorReadyCB(

DCHECK(decryptor_ready_cb_.is_null());

// Mixed use of prefixed and unprefixed EME APIs is disallowed by Blink.

- DCHECK(!(proxy_decryptor_ && web_cdm_));

+ DCHECK(!proxy_decryptor_ || !web_cdm_);

if (proxy_decryptor_) {

decryptor_ready_cb.Run(proxy_decryptor_->GetDecryptor());