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

Unified Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 23072043: Change NeedKeyCB to use std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index c651764cf816ad9de1e2fefefe5319564b7dc0be..d9cb4ac205f525a831ae3e4c5fdfed31d174cb8c 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -923,8 +923,7 @@ void WebMediaPlayerImpl::OnKeyAdded(const std::string& session_id) {
void WebMediaPlayerImpl::OnNeedKey(const std::string& session_id,
const std::string& type,
- scoped_ptr<uint8[]> init_data,
- int init_data_size) {
+ const std::vector<uint8>& init_data) {
DCHECK(main_loop_->BelongsToCurrentThread());
// Do not fire NeedKey event if encrypted media is not enabled.
@@ -939,8 +938,8 @@ void WebMediaPlayerImpl::OnNeedKey(const std::string& session_id,
GetClient()->keyNeeded(WebString(),
WebString::fromUTF8(session_id),
- init_data.get(),
- init_data_size);
+ &init_data[0],
xhwang 2013/08/23 17:24:37 ditto
acolwell GONE FROM CHROMIUM 2013/08/23 19:55:28 Done.
+ init_data.size());
}
scoped_ptr<media::TextTrack>

Powered by Google App Engine
This is Rietveld 408576698