webkit/renderer/media/crypto/ppapi_decryptor.cc - Issue 17381007: EME: ProxyDecryptor creates MediaKeys instead of Decryptor.

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/crypto/ppapi_decryptor.cc

Issue 17381007: EME: ProxyDecryptor creates MediaKeys instead of Decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again 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/crypto/ppapi_decryptor.cc

diff --git a/webkit/renderer/media/crypto/ppapi_decryptor.cc b/webkit/renderer/media/crypto/ppapi_decryptor.cc

index 786eb19a4ce5f411adaf0af3d6742274e02f1e70..71f4685f5e291028988b8afad46a1ba3e6552db8 100644

--- a/webkit/renderer/media/crypto/ppapi_decryptor.cc

+++ b/webkit/renderer/media/crypto/ppapi_decryptor.cc

@@ -126,7 +126,7 @@ void PpapiDecryptor::CancelKeyRequest(const std::string& session_id) {

ReportFailureToCallPlugin(session_id);

}

-media::MediaKeys* PpapiDecryptor::GetMediaKeys() {

+media::Decryptor* PpapiDecryptor::GetDecryptor() {

return this;

}