webkit/media/crypto/ppapi/clear_key_cdm.cc - Issue 11226019: Encrypted Media: Replace DecryptorClient with key event callbacks.

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

Issue 11226019: Encrypted Media: Replace DecryptorClient with key event callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: tests updated; ready for review Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« media/filters/pipeline_integration_test.cc ('K') | « webkit/media/crypto/ppapi/clear_key_cdm.h ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | webkit/media/crypto/ppapi_decryptor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/media/crypto/ppapi/clear_key_cdm.cc

diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc

index c546c6a13344abbc7fb573af99b0661a37fd6761..22e3445fa26e19bf1c6e7233236c71a96421a424 100644

--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc

+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc

@@ -190,7 +190,10 @@ void ClearKeyCdm::Client::NeedKey(const std::string& key_system,

}

ClearKeyCdm::ClearKeyCdm(cdm::Allocator* allocator, cdm::Host* host)

- : decryptor_(&client_),

+ : decryptor_(base::Bind(&Client::KeyAdded, base::Unretained(&client_)),

+ base::Bind(&Client::KeyError, base::Unretained(&client_)),

+ base::Bind(&Client::KeyMessage, base::Unretained(&client_)),

+ base::Bind(&Client::NeedKey, base::Unretained(&client_))),

allocator_(allocator),

host_(host),

timer_delay_ms_(kInitialTimerDelayMs),