content/renderer/media/crypto/ppapi_decryptor.cc - Issue 19744007: Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/crypto/ppapi_decryptor.cc

Issue 19744007: Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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

« chrome/renderer/pepper/ppb_pdf_impl.cc ('K') | « content/renderer/media/crypto/ppapi_decryptor.h ('k') | content/renderer/pepper/pepper_audio_input_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/crypto/ppapi_decryptor.cc

===================================================================

--- content/renderer/media/crypto/ppapi_decryptor.cc (revision 213350)

+++ content/renderer/media/crypto/ppapi_decryptor.cc (working copy)

@@ -18,13 +18,13 @@

#include "media/base/video_decoder_config.h"

#include "media/base/video_frame.h"

#include "webkit/plugins/ppapi/content_decryptor_delegate.h"

-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"

+#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"

namespace content {

scoped_ptr<PpapiDecryptor> PpapiDecryptor::Create(

const std::string& key_system,

- const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance,

+ const scoped_refptr<webkit::ppapi::PluginInstanceImpl>& plugin_instance,

const media::KeyAddedCB& key_added_cb,

const media::KeyErrorCB& key_error_cb,

const media::KeyMessageCB& key_message_cb,

@@ -47,7 +47,7 @@

}

PpapiDecryptor::PpapiDecryptor(

- const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance,

+ const scoped_refptr<webkit::ppapi::PluginInstanceImpl>& plugin_instance,

webkit::ppapi::ContentDecryptorDelegate* plugin_cdm_delegate,

const media::KeyAddedCB& key_added_cb,

const media::KeyErrorCB& key_error_cb,