webkit/media/webmediaplayer_proxy.cc - Issue 10539150: Add Decryptor interface.

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/media/webmediaplayer_proxy.cc

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase and move client() to protected. Created 8 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/media/webmediaplayer_proxy.cc

diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc

index 461f67ec309f681602871a6531eb565a767a72b7..8b2adc11bde083a6740fbc5f429c008325e3575a 100644

--- a/webkit/media/webmediaplayer_proxy.cc

+++ b/webkit/media/webmediaplayer_proxy.cc

@@ -245,7 +245,7 @@ void WebMediaPlayerProxy::KeyAdded(const std::string& key_system,

void WebMediaPlayerProxy::KeyError(const std::string& key_system,

const std::string& session_id,

- media::AesDecryptor::KeyError error_code,

+ media::Decryptor::KeyError error_code,

int system_code) {

render_loop_->PostTask(FROM_HERE, base::Bind(

&WebMediaPlayerProxy::KeyErrorTask, this, key_system, session_id,

@@ -280,7 +280,7 @@ void WebMediaPlayerProxy::KeyAddedTask(const std::string& key_system,

void WebMediaPlayerProxy::KeyErrorTask(const std::string& key_system,

const std::string& session_id,

- media::AesDecryptor::KeyError error_code,

+ media::Decryptor::KeyError error_code,

int system_code) {

DCHECK(render_loop_->BelongsToCurrentThread());

if (webmediaplayer_)

« media/crypto/aes_decryptor.h ('K') | « webkit/media/webmediaplayer_proxy.h ('k') | no next file » | no next file with comments »