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

Unified Diff: media/blink/cdm_session_adapter.cc

Issue 1072403009: Use std::vector<uint8_t> instead of uint8*/int for MediaKeys interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/blink/cdm_session_adapter.cc
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index 8e62bcee716d743f26bc09f62ce09c1fbf6db008..7345a107ef42ddac9387d9254e50c4135840d9a9 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -50,11 +50,9 @@ void CdmSessionAdapter::CreateCdm(
}
void CdmSessionAdapter::SetServerCertificate(
- const uint8* server_certificate,
- int server_certificate_length,
+ const std::vector<uint8>& server_certificate,
scoped_ptr<SimpleCdmPromise> promise) {
- cdm_->SetServerCertificate(server_certificate, server_certificate_length,
- promise.Pass());
+ cdm_->SetServerCertificate(server_certificate, promise.Pass());
}
WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::CreateSession() {
@@ -79,12 +77,11 @@ void CdmSessionAdapter::UnregisterSession(const std::string& session_id) {
void CdmSessionAdapter::InitializeNewSession(
EmeInitDataType init_data_type,
- const uint8* init_data,
- int init_data_length,
+ const std::vector<uint8>& init_data,
MediaKeys::SessionType session_type,
scoped_ptr<NewSessionCdmPromise> promise) {
cdm_->CreateSessionAndGenerateRequest(session_type, init_data_type, init_data,
- init_data_length, promise.Pass());
+ promise.Pass());
}
void CdmSessionAdapter::LoadSession(MediaKeys::SessionType session_type,
@@ -94,10 +91,9 @@ void CdmSessionAdapter::LoadSession(MediaKeys::SessionType session_type,
}
void CdmSessionAdapter::UpdateSession(const std::string& session_id,
- const uint8* response,
- int response_length,
+ const std::vector<uint8>& response,
scoped_ptr<SimpleCdmPromise> promise) {
- cdm_->UpdateSession(session_id, response, response_length, promise.Pass());
+ cdm_->UpdateSession(session_id, response, promise.Pass());
}
void CdmSessionAdapter::CloseSession(const std::string& session_id,

Powered by Google App Engine
This is Rietveld 408576698