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

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

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 8 years, 2 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 6ef4a5efee5a048ace670041f0378d9cb856ef6d..ea1ffbadb94c6ade4c86c396f302b4df1846ef2f 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -58,7 +58,7 @@ static void FireNeedKey(media::DecryptorClient* client,
std::string key_id = encrypted->GetDecryptConfig()->key_id();
scoped_array<uint8> key_id_array(new uint8[key_id.size()]);
memcpy(key_id_array.get(), key_id.data(), key_id.size());
- client->NeedKey("", "", key_id_array.Pass(), key_id.size());
+ client->NeedKey("", "", "", key_id_array.Pass(), key_id.size());
}
ProxyDecryptor::ProxyDecryptor(
@@ -101,6 +101,7 @@ void ProxyDecryptor::RequestDecryptorNotification(
}
bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
+ const std::string& type,
const uint8* init_data,
int init_data_length) {
// We do not support run-time switching of decryptors. GenerateKeyRequest()
@@ -117,7 +118,7 @@ bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
}
}
- if (!decryptor_->GenerateKeyRequest(key_system,
+ if (!decryptor_->GenerateKeyRequest(key_system, type,
init_data, init_data_length)) {
decryptor_.reset();
return false;

Powered by Google App Engine
This is Rietveld 408576698