Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: webkit/media/crypto/proxy_decryptor.cc

Issue 10704241: Add PpapiDecryptor which wraps a CDM plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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:
View side-by-side diff with in-line comments
Download patch
Index: webkit/media/crypto/proxy_decryptor.cc
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index 0c9646452325c69a2a93bbebbf586e4377f2ed70..3f89fedb4059c12be8f0bfcd07d4113cc9f92e37 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -12,8 +12,10 @@
namespace webkit_media {
-ProxyDecryptor::ProxyDecryptor(media::DecryptorClient* client)
- : client_(client) {
+ProxyDecryptor::ProxyDecryptor(media::DecryptorClient* client,
+ const CreatePluginCB& create_plugin_cb)
+ : client_(client),
+ create_plugin_cb_(create_plugin_cb) {
}
ProxyDecryptor::~ProxyDecryptor() {
@@ -26,7 +28,7 @@ void ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
// only creates a new decryptor when |decryptor_| is not initialized.
if (!decryptor_.get()) {
base::AutoLock auto_lock(lock_);
- decryptor_ = CreateDecryptor(key_system, client_);
+ decryptor_ = CreateDecryptor(key_system, client_, create_plugin_cb_);
ddorwin 2012/07/17 21:31:28 As mentioned in ppapi_decryptor.cc, I think we sho
xhwang 2012/07/18 19:43:17 Done.
}
DCHECK(decryptor_.get());

Powered by Google App Engine
This is Rietveld 408576698