diff options
author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 00:41:21 +0000 |
---|---|---|
committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 00:41:21 +0000 |
commit | 27c59ba15305e33fa316154dc87b6cc5c71c2843 (patch) | |
tree | de7eaa732da77c33528b2e34991e2cb38cea4a0b /ppapi/proxy/ppp_content_decryptor_private_proxy.cc | |
parent | f429bc913006b1fb038ece04b6846aef3590b154 (diff) | |
download | chromium_src-27c59ba15305e33fa316154dc87b6cc5c71c2843.zip chromium_src-27c59ba15305e33fa316154dc87b6cc5c71c2843.tar.gz chromium_src-27c59ba15305e33fa316154dc87b6cc5c71c2843.tar.bz2 |
Fix in process PPAPI decryption.
TEST=EME content decryption via ExternalClearKey works in-process.
Review URL: https://chromiumcodereview.appspot.com/11477002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppp_content_decryptor_private_proxy.cc')
-rw-r--r-- | ppapi/proxy/ppp_content_decryptor_private_proxy.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc index 1b472074..9aca5e7 100644 --- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc +++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc @@ -75,22 +75,6 @@ PP_Var ExtractReceivedVarAndAddRef(Dispatcher* dispatcher, return var; } -// Increments the reference count on |resource| to ensure that it remains valid -// until the plugin receives the resource within the asynchronous message sent -// from the proxy. The plugin side takes ownership of that reference. Returns -// PP_TRUE when the reference is successfully added, PP_FALSE otherwise. -PP_Bool AddRefResourceForPlugin(HostDispatcher* dispatcher, - PP_Resource resource) { - const PPB_Core* core = static_cast<const PPB_Core*>( - dispatcher->local_get_interface()(PPB_CORE_INTERFACE)); - if (!core) { - NOTREACHED(); - return PP_FALSE; - } - core->AddRefResource(resource); - return PP_TRUE; -} - bool InitializePppDecryptorBuffer(PP_Instance instance, HostDispatcher* dispatcher, PP_Resource resource, @@ -107,9 +91,6 @@ bool InitializePppDecryptorBuffer(PP_Instance instance, return true; } - if (!AddRefResourceForPlugin(dispatcher, resource)) - return false; - HostResource host_resource; host_resource.SetHostResource(instance, resource); |