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

Unified Diff: webkit/media/crypto/ppapi/clear_key_cdm.cc

Issue 11469040: EME v0.1: Report defaultURL in KeyMessage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | webkit/media/webmediaplayer_impl.h » ('j') | webkit/media/webmediaplayer_proxy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 2f0453aa8556105d0f4af5b7fbf7869d6f0f0193..7de21547531a561f69439b172754c1678ec6fc4b 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -185,6 +185,7 @@ void ClearKeyCdm::Client::KeyMessage(const std::string& key_system,
session_id_ = session_id;
key_message_ = message.Pass();
key_message_length_ = message_length;
+ default_url_ = default_url;
}
void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
@@ -293,7 +294,8 @@ void ClearKeyCdm::TimerExpired(cdm::KeyMessage* msg, bool* populated) {
msg->set_message(allocator_->Allocate(msg_string.length()));
memcpy(msg->message()->data(), msg_string.data(), msg_string.length());
msg->set_session_id(latest_session_id_.data(), latest_session_id_.length());
- msg->set_default_url(NULL, 0);
+ const char url[] = "http://externalclearkey.chromium.org";
+ msg->set_default_url(url, arraysize(url));
*populated = true;
« no previous file with comments | « no previous file | webkit/media/webmediaplayer_impl.h » ('j') | webkit/media/webmediaplayer_proxy.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698