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

Unified Diff: webkit/media/webmediaplayer_proxy.cc

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the DCHECK where init_data_type_ is set but NeedKey from decoder passes empty "type". Created 8 years, 2 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
« no previous file with comments | « webkit/media/webmediaplayer_proxy.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_proxy.cc
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index 05fe0d059c758cc669f29d92760b37b56d5d85af..13941bf2ad6b5518e57fabf3e200562119889c5e 100644
--- a/webkit/media/webmediaplayer_proxy.cc
+++ b/webkit/media/webmediaplayer_proxy.cc
@@ -135,10 +135,11 @@ void WebMediaPlayerProxy::KeyMessage(const std::string& key_system,
void WebMediaPlayerProxy::NeedKey(const std::string& key_system,
const std::string& session_id,
+ const std::string& type,
scoped_array<uint8> init_data,
int init_data_size) {
render_loop_->PostTask(FROM_HERE, base::Bind(
- &WebMediaPlayerProxy::NeedKeyTask, this, key_system, session_id,
+ &WebMediaPlayerProxy::NeedKeyTask, this, key_system, session_id, type,
base::Passed(&init_data), init_data_size));
}
@@ -172,11 +173,12 @@ void WebMediaPlayerProxy::KeyMessageTask(const std::string& key_system,
void WebMediaPlayerProxy::NeedKeyTask(const std::string& key_system,
const std::string& session_id,
+ const std::string& type,
scoped_array<uint8> init_data,
int init_data_size) {
DCHECK(render_loop_->BelongsToCurrentThread());
if (webmediaplayer_)
- webmediaplayer_->OnNeedKey(key_system, session_id,
+ webmediaplayer_->OnNeedKey(key_system, session_id, type,
init_data.Pass(), init_data_size);
}
« no previous file with comments | « webkit/media/webmediaplayer_proxy.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698