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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 10704241: Add PpapiDecryptor which wraps a CDM plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve comments and rebase. Created 8 years, 5 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
« webkit/media/crypto/proxy_decryptor.cc ('K') | « webkit/media/webkit_media.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 6924f8a63d482be1d99bfc1edf67a70948a555e4..53ff74c9140a2dabf786faaea8783f88c5459427 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -37,6 +37,7 @@
#include "webkit/media/webmediaplayer_proxy.h"
#include "webkit/media/webmediaplayer_util.h"
#include "webkit/media/webvideoframe_impl.h"
+#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
using WebKit::WebCanvas;
using WebKit::WebMediaPlayer;
@@ -131,7 +132,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
audio_source_provider_(audio_source_provider),
audio_renderer_sink_(audio_renderer_sink),
is_local_source_(false),
- decryptor_(proxy_.get()) {
+ decryptor_(proxy_.get(), client, frame) {
media_log_->AddEvent(
media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
« webkit/media/crypto/proxy_decryptor.cc ('K') | « webkit/media/webkit_media.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698