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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.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/ppapi/external_clear_key/clear_key_cdm.h ('k') | media/cdm/proxy_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index 48b0bb063c0b72a3ad1fea7783486922d3b5b0d0..c06c76ad3098af37415a99f41fd7101131bf6013 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -671,7 +671,8 @@ void ClearKeyCdm::LoadLoadableSession() {
void ClearKeyCdm::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) {
DVLOG(1) << "OnSessionMessage: " << message.size();
// Ignore the message when we are waiting to update the loadable session.
@@ -682,13 +683,11 @@ void ClearKeyCdm::OnSessionMessage(const std::string& web_session_id,
// involved (OnSessionCreated() called to resolve the CreateSession()
// promise).
// TODO(jrummell): Pass |message_type| on when this class is updated
- // to Host_7. For now, pass NULL as the |destination_url| since we have
- // no idea what it should be.
- host_->OnSessionMessage(web_session_id.data(),
- web_session_id.length(),
+ // to Host_7.
+ host_->OnSessionMessage(web_session_id.data(), web_session_id.length(),
reinterpret_cast<const char*>(message.data()),
- message.size(),
- nullptr, 0);
+ message.size(), legacy_destination_url.spec().data(),
+ legacy_destination_url.spec().size());
}
void ClearKeyCdm::OnSessionKeysChange(const std::string& web_session_id,
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.h ('k') | media/cdm/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698