content/renderer/media/crypto/ppapi_decryptor.h - 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.h

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: review comments and undo checkdeps change 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

« no previous file with comments | « content/renderer/media/crypto/content_decryption_module_factory.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- content/renderer/media/crypto/ppapi_decryptor.h (revision 213462)

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

@@ -22,7 +22,7 @@

namespace webkit {

namespace ppapi {

class ContentDecryptorDelegate;

-class PluginInstance;

+class PluginInstanceImpl;

}

@@ -36,7 +36,7 @@

static scoped_ptr<PpapiDecryptor> Create(

// TODO(ddorwin): Remove after updating the delegate.

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,

@@ -76,7 +76,7 @@

private:

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,

@@ -99,7 +99,7 @@

// Hold a reference of the plugin instance to make sure the plugin outlives

// the |plugin_cdm_delegate_|. This is needed because |plugin_cdm_delegate_|

// is owned by the |plugin_instance_|.

- scoped_refptr<webkit::ppapi::PluginInstance> plugin_instance_;

+ scoped_refptr<webkit::ppapi::PluginInstanceImpl> plugin_instance_;

webkit::ppapi::ContentDecryptorDelegate* plugin_cdm_delegate_;