diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 05:25:00 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 05:25:00 +0000 |
| commit | a6e4fbfd6c6848be53e04bcd11b097df8399064d (patch) | |
| tree | 5d2b2b23e3546d06a84aaf05a77492c469a00a6e /ppapi/proxy/ppb_instance_proxy.cc | |
| parent | 0d2bd8b4c40f047a5c7e8163efd5ca87a9c34094 (diff) | |
| download | chromium_src-a6e4fbfd6c6848be53e04bcd11b097df8399064d.zip chromium_src-a6e4fbfd6c6848be53e04bcd11b097df8399064d.tar.gz chromium_src-a6e4fbfd6c6848be53e04bcd11b097df8399064d.tar.bz2 | |
Change PPB_ContentDecryptor_Private::KeyMessage to pass the message as a PP_Var instead of a PP_Resource.
BUG=164498
TEST=EME decrypt and decode continues to work.
Review URL: https://chromiumcodereview.appspot.com/11442029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_instance_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 3fb3e18..f4b0f35 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -543,24 +543,15 @@ void PPB_Instance_Proxy::KeyAdded(PP_Instance instance, void PPB_Instance_Proxy::KeyMessage(PP_Instance instance, PP_Var key_system, PP_Var session_id, - PP_Resource message, + PP_Var message, PP_Var default_url) { - PP_Resource host_resource = 0; - if (message) { - Resource* object = - PpapiGlobals::Get()->GetResourceTracker()->GetResource(message); - if (!object || object->pp_instance() != instance) - return; - host_resource = object->host_resource().host_resource(); - } - dispatcher()->Send( new PpapiHostMsg_PPBInstance_KeyMessage( API_ID_PPB_INSTANCE, instance, SerializedVarSendInput(dispatcher(), key_system), SerializedVarSendInput(dispatcher(), session_id), - host_resource, + SerializedVarSendInput(dispatcher(), message), SerializedVarSendInput(dispatcher(), default_url))); } @@ -1062,7 +1053,7 @@ void PPB_Instance_Proxy::OnHostMsgKeyMessage( PP_Instance instance, SerializedVarReceiveInput key_system, SerializedVarReceiveInput session_id, - PP_Resource message, + SerializedVarReceiveInput message, SerializedVarReceiveInput default_url) { if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE)) return; @@ -1071,7 +1062,7 @@ void PPB_Instance_Proxy::OnHostMsgKeyMessage( enter.functions()->KeyMessage(instance, key_system.Get(dispatcher()), session_id.Get(dispatcher()), - message, + message.Get(dispatcher()), default_url.Get(dispatcher())); } } |