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

Unified Diff: media/cdm/aes_decryptor.cc

Issue 131653003: Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 10 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
Index: media/cdm/aes_decryptor.cc
diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index c682e026c83d7bc96f63faae3d1acfceeb87a1fb..82c899dece597c392a7f8386038b9726a988f437 100644
--- a/media/cdm/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -231,7 +231,7 @@ AesDecryptor::~AesDecryptor() {
}
bool AesDecryptor::CreateSession(uint32 session_id,
- const std::string& type,
+ const std::string& content_type,
const uint8* init_data,
int init_data_length) {
// Validate that this is a new session.
@@ -240,7 +240,7 @@ bool AesDecryptor::CreateSession(uint32 session_id,
std::string web_session_id_string(base::UintToString(next_web_session_id_++));
- // For now, the AesDecryptor does not care about |type|;
+ // For now, the AesDecryptor does not care about |content_type|;
// just fire the event with the |init_data| as the request.
std::vector<uint8> message;
if (init_data && init_data_length)
@@ -251,6 +251,13 @@ bool AesDecryptor::CreateSession(uint32 session_id,
return true;
}
+void AesDecryptor::LoadSession(uint32 session_id,
+ const std::string& web_session_id) {
+ // TODO(xhwang): Change this to NOTREACHED() when blink checks for key systems
+ // that do not support loadSession. See http://crbug.com/342481
+ session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
+}
+
void AesDecryptor::UpdateSession(uint32 session_id,
const uint8* response,
int response_length) {

Powered by Google App Engine
This is Rietveld 408576698