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

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: Updates and added test 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
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 e6dbd8a972e79409a18bcf14db47e0a5264bde9f..924b62bed079fc9afc580110c30959edb47bc2d3 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -175,6 +175,7 @@ void ClearKeyCdm::Client::KeyMessage(const std::string& key_system,
status_ = kKeyMessage;
session_id_ = session_id;
key_message_ = message;
+ default_url_ = default_url;
}
void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
@@ -271,10 +272,14 @@ void ClearKeyCdm::TimerExpired(void* context) {
next_heartbeat_message_ :
"ERROR: Invalid timer context found!";
+ // This URL is only used for testing the code path for defaultURL.
+ // There is no service at this URL, so applications should ignore it.
+ const char url[] = "http://test.externalclearkey.chromium.org";
+
host_->SendKeyMessage(
heartbeat_session_id_.data(), heartbeat_session_id_.size(),
heartbeat_message.data(), heartbeat_message.size(),
- NULL, 0);
+ url, arraysize(url) - 1);
ScheduleNextHeartBeat();
}

Powered by Google App Engine
This is Rietveld 408576698