webkit/renderer/media/crypto/ppapi_decryptor.h - 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.h

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.h

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

index 30c96988c5e5ecd0e613e0c8fef5cf6c72e07153..6a360f47797a6fe0773c0b4d4335c83bcb2f781f 100644

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

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

@@ -51,9 +51,9 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor {

const uint8* init_data, int init_data_length,

const std::string& session_id) OVERRIDE;

virtual void CancelKeyRequest(const std::string& session_id) OVERRIDE;

+ virtual Decryptor* GetDecryptor() OVERRIDE;

// media::Decryptor implementation.

- virtual media::MediaKeys* GetMediaKeys() OVERRIDE;

virtual void RegisterNewKeyCB(StreamType stream_type,

const NewKeyCB& key_added_cb) OVERRIDE;

virtual void Decrypt(StreamType stream_type,

« no previous file with comments | « media/crypto/aes_decryptor.cc ('k') | webkit/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »