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

Unified Diff: content/renderer/media/android/proxy_media_keys.cc

Issue 105383002: Rename EME WD call parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit Created 7 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: content/renderer/media/android/proxy_media_keys.cc
diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
index d7bb6cbb0447e6102d986f3d62941d1d96119396..ed7991a6c2ef2118819bc2f46d8c832dbde15527 100644
--- a/content/renderer/media/android/proxy_media_keys.cc
+++ b/content/renderer/media/android/proxy_media_keys.cc
@@ -45,54 +45,54 @@ void ProxyMediaKeys::InitializeCDM(const std::string& key_system,
#endif
}
-bool ProxyMediaKeys::CreateSession(uint32 reference_id,
+bool ProxyMediaKeys::CreateSession(uint32 session_id,
const std::string& type,
const uint8* init_data,
int init_data_length) {
manager_->GenerateKeyRequest(
media_keys_id_,
- reference_id,
+ session_id,
type,
std::vector<uint8>(init_data, init_data + init_data_length));
return true;
}
-void ProxyMediaKeys::UpdateSession(uint32 reference_id,
+void ProxyMediaKeys::UpdateSession(uint32 session_id,
const uint8* response,
int response_length) {
manager_->AddKey(media_keys_id_,
- reference_id,
+ session_id,
std::vector<uint8>(response, response + response_length),
std::vector<uint8>());
}
-void ProxyMediaKeys::ReleaseSession(uint32 reference_id) {
- manager_->CancelKeyRequest(media_keys_id_, reference_id);
+void ProxyMediaKeys::ReleaseSession(uint32 session_id) {
+ manager_->CancelKeyRequest(media_keys_id_, session_id);
}
-void ProxyMediaKeys::OnSessionCreated(uint32 reference_id,
- const std::string& session_id) {
- session_created_cb_.Run(reference_id, session_id);
+void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
+ const std::string& web_session_id) {
+ session_created_cb_.Run(session_id, web_session_id);
}
-void ProxyMediaKeys::OnSessionMessage(uint32 reference_id,
+void ProxyMediaKeys::OnSessionMessage(uint32 session_id,
const std::vector<uint8>& message,
const std::string& destination_url) {
- session_message_cb_.Run(reference_id, message, destination_url);
+ session_message_cb_.Run(session_id, message, destination_url);
}
-void ProxyMediaKeys::OnSessionReady(uint32 reference_id) {
- session_ready_cb_.Run(reference_id);
+void ProxyMediaKeys::OnSessionReady(uint32 session_id) {
+ session_ready_cb_.Run(session_id);
}
-void ProxyMediaKeys::OnSessionClosed(uint32 reference_id) {
- session_closed_cb_.Run(reference_id);
+void ProxyMediaKeys::OnSessionClosed(uint32 session_id) {
+ session_closed_cb_.Run(session_id);
}
-void ProxyMediaKeys::OnSessionError(uint32 reference_id,
+void ProxyMediaKeys::OnSessionError(uint32 session_id,
media::MediaKeys::KeyError error_code,
int system_code) {
- session_error_cb_.Run(reference_id, error_code, system_code);
+ session_error_cb_.Run(session_id, error_code, system_code);
}
} // namespace content
« no previous file with comments | « content/renderer/media/android/proxy_media_keys.h ('k') | content/renderer/media/android/renderer_media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698