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

Unified Diff: content/renderer/media/crypto/proxy_media_keys.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: content/renderer/media/crypto/proxy_media_keys.cc
diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
index 9dd2de674343107d661dc9060fc1549f0f62e2e4..c3cf8d9f05343e653974e7d503f9acdbdd27d412 100644
--- a/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -40,21 +40,16 @@ ProxyMediaKeys::~ProxyMediaKeys() {
}
void ProxyMediaKeys::SetServerCertificate(
- const uint8* certificate_data,
- int certificate_data_length,
+ const std::vector<uint8>& certificate,
scoped_ptr<media::SimpleCdmPromise> promise) {
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
- manager_->SetServerCertificate(
- cdm_id_, promise_id,
- std::vector<uint8>(certificate_data,
- certificate_data + certificate_data_length));
+ manager_->SetServerCertificate(cdm_id_, promise_id, certificate);
}
void ProxyMediaKeys::CreateSessionAndGenerateRequest(
SessionType session_type,
media::EmeInitDataType init_data_type,
- const uint8* init_data,
- int init_data_length,
+ const std::vector<uint8>& init_data,
scoped_ptr<media::NewSessionCdmPromise> promise) {
if (session_type != media::MediaKeys::TEMPORARY_SESSION) {
promise->reject(NOT_SUPPORTED_ERROR, 0,
@@ -83,8 +78,7 @@ void ProxyMediaKeys::CreateSessionAndGenerateRequest(
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
manager_->CreateSessionAndGenerateRequest(
- cdm_id_, promise_id, create_session_init_data_type,
- std::vector<uint8>(init_data, init_data + init_data_length));
+ cdm_id_, promise_id, create_session_init_data_type, init_data);
}
void ProxyMediaKeys::LoadSession(
@@ -99,13 +93,10 @@ void ProxyMediaKeys::LoadSession(
void ProxyMediaKeys::UpdateSession(
const std::string& session_id,
- const uint8* response,
- int response_length,
+ const std::vector<uint8>& response,
scoped_ptr<media::SimpleCdmPromise> promise) {
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
- manager_->UpdateSession(
- cdm_id_, promise_id, session_id,
- std::vector<uint8>(response, response + response_length));
+ manager_->UpdateSession(cdm_id_, promise_id, session_id, response);
}
void ProxyMediaKeys::CloseSession(const std::string& session_id,

Powered by Google App Engine
This is Rietveld 408576698