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

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

index 588801c471b6b9aaee85eff263a6347216c3f71d..bb5d3b6dd85183bacced1b4e0f197972dc3663e6 100644

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

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

@@ -22,7 +22,7 @@

#include "media/base/media_switches.h"

#include "media/base/pipeline.h"

#include "media/base/video_frame.h"

-#include "media/crypto/aes_decryptor.h"

+#include "media/crypto/decryptor.h"

#include "media/filters/audio_renderer_impl.h"

#include "media/filters/video_renderer_base.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"

@@ -893,7 +893,7 @@ void WebMediaPlayerImpl::OnNeedKey(const std::string& key_system,

void WebMediaPlayerImpl::OnKeyError(const std::string& key_system,

const std::string& session_id,

- media::AesDecryptor::KeyError error_code,

+ media::Decryptor::KeyError error_code,

int system_code) {

DCHECK_EQ(main_loop_, MessageLoop::current());