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

Unified Diff: media/cdm/proxy_decryptor.cc

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes Created 5 years, 11 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
« no previous file with comments | « media/cdm/proxy_decryptor.h ('k') | media/mojo/interfaces/content_decryption_module.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/proxy_decryptor.cc
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index 15d438864ee1df7eda4f2dc4bd4ec41c9db3a1de..434988b78da2e8316af0e0ad6d248c6998bf8f7e 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -211,24 +211,21 @@ scoped_ptr<MediaKeys> ProxyDecryptor::CreateMediaKeys(
void ProxyDecryptor::OnSessionMessage(const std::string& web_session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8>& message) {
+ const std::vector<uint8>& message,
+ const GURL& legacy_destination_url) {
// Assumes that OnSessionCreated() has been called before this.
- // EME v0.1b gets passed |destination_url| rather than |message_type|.
- // Since we have no idea what the URL should be, return an empty one in all
- // cases.
-
// For ClearKey, convert the message from JSON into just passing the key
// as the message. If unable to extract the key, return the message unchanged.
if (is_clear_key_) {
std::vector<uint8> key;
if (ExtractFirstKeyIdFromLicenseRequest(message, &key)) {
- key_message_cb_.Run(web_session_id, key, GURL());
+ key_message_cb_.Run(web_session_id, key, legacy_destination_url);
return;
}
}
- key_message_cb_.Run(web_session_id, message, GURL());
+ key_message_cb_.Run(web_session_id, message, legacy_destination_url);
}
void ProxyDecryptor::OnSessionKeysChange(const std::string& web_session_id,
« no previous file with comments | « media/cdm/proxy_decryptor.h ('k') | media/mojo/interfaces/content_decryption_module.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698