Modify the PPAPI CDM interface to pass more info.

ppapi/proxy/ppp_content_decryptor_private_proxy.cc

Index: ppapi/proxy/ppp_content_decryptor_private_proxy.cc
diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
index dd72335ec5a2a0579f47a8952a79ffe49aa2e974..9b839756a84d036e104fb6ff4d5242a47ea9f03e 100644
--- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
+++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
@@ -7,6 +7,7 @@
 #include "base/platform_file.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/ppb_core.h"
+#include "ppapi/proxy/content_decryptor_private_serializer-inl.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
@@ -93,7 +94,8 @@ PP_Bool GenerateKeyRequest(PP_Instance instance,
 
 PP_Bool AddKey(PP_Instance instance,
                PP_Var session_id,
-               PP_Var key) {
+               PP_Var key,
+               PP_Var init_data) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
@@ -105,7 +107,8 @@ PP_Bool AddKey(PP_Instance instance,
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
           SerializedVarSendInput(dispatcher, session_id),
-          SerializedVarSendInput(dispatcher, key))));
+          SerializedVarSendInput(dispatcher, key),
+          SerializedVarSendInput(dispatcher, init_data))));
 }
 
 PP_Bool CancelKeyRequest(PP_Instance instance, PP_Var session_id) {
@@ -124,7 +127,7 @@ PP_Bool CancelKeyRequest(PP_Instance instance, PP_Var session_id) {
 
 PP_Bool Decrypt(PP_Instance instance,
                 PP_Resource encrypted_block,
-                int32_t request_id) {
+                const PP_EncryptedBlockInfo* encrypted_block_info) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
@@ -160,17 +163,22 @@ PP_Bool Decrypt(PP_Instance instance,
   buffer.handle = handle;
   buffer.size = size;
 
+  using ppapi::proxy::SerializeBlockInfo;

[Tom Finegan, 2012/08/20 21:31:45]

Should I just do this at file scope?

[dmichael (off chromium), 2012/08/21 17:37:08]

Why do you even need it? Aren't you in ppapi::proxy already?

[Tom Finegan, 2012/08/21 22:57:38]

Oops; question mooted.

+  std::string serialized_block_info;
+  if (!SerializeBlockInfo(encrypted_block_info, &serialized_block_info))
+    return PP_FALSE;
+
   return PP_FromBool(dispatcher->Send(
       new PpapiMsg_PPPContentDecryptor_Decrypt(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
           buffer,
-          request_id)));
+          serialized_block_info)));
 }
 
 PP_Bool DecryptAndDecode(PP_Instance instance,
                          PP_Resource encrypted_block,
-                         int32_t request_id) {
+                         const PP_EncryptedBlockInfo* encrypted_block_info) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
@@ -180,12 +188,32 @@ PP_Bool DecryptAndDecode(PP_Instance instance,
   HostResource host_resource;
   host_resource.SetHostResource(instance, encrypted_block);
 
+  uint32_t size = 0;
+  if (DescribeHostBufferResource(encrypted_block, &size) == PP_FALSE)
+    return PP_FALSE;
+
+  base::SharedMemoryHandle handle;
+  if (ShareHostBufferResourceToPlugin(dispatcher,
+                                      encrypted_block,
+                                      &handle) == PP_FALSE)
+    return PP_FALSE;
+
+  PPPDecryptor_Buffer buffer;
+  buffer.resource = host_resource;
+  buffer.handle = handle;
+  buffer.size = size;
+
+  using ppapi::proxy::SerializeBlockInfo;
+  std::string serialized_block_info;
+  if (!SerializeBlockInfo(encrypted_block_info, &serialized_block_info))
+    return PP_FALSE;
+
   return PP_FromBool(dispatcher->Send(
       new PpapiMsg_PPPContentDecryptor_DecryptAndDecode(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
-          host_resource,
-          request_id)));
+          buffer,
+          serialized_block_info)));
 }
 
 static const PPP_ContentDecryptor_Private content_decryptor_interface = {
@@ -257,12 +285,14 @@ void PPP_ContentDecryptor_Private_Proxy::OnMsgGenerateKeyRequest(
 void PPP_ContentDecryptor_Private_Proxy::OnMsgAddKey(
     PP_Instance instance,
     SerializedVarReceiveInput session_id,
-    SerializedVarReceiveInput key) {
+    SerializedVarReceiveInput key,
+    SerializedVarReceiveInput init_data) {
   if (ppp_decryptor_impl_) {
     CallWhileUnlocked(ppp_decryptor_impl_->AddKey,
                       instance,
                       ExtractReceivedVarAndAddRef(dispatcher(), &session_id),
-                      ExtractReceivedVarAndAddRef(dispatcher(), &key));
+                      ExtractReceivedVarAndAddRef(dispatcher(), &key),
+                      ExtractReceivedVarAndAddRef(dispatcher(), &init_data));
   }
 }
 
@@ -279,31 +309,38 @@ void PPP_ContentDecryptor_Private_Proxy::OnMsgCancelKeyRequest(
 void PPP_ContentDecryptor_Private_Proxy::OnMsgDecrypt(
     PP_Instance instance,
     const PPPDecryptor_Buffer& encrypted_buffer,
-    int32_t request_id) {
+    const std::string& serialized_block_info) {
   if (ppp_decryptor_impl_) {
     PP_Resource plugin_resource =
         PPB_Buffer_Proxy::AddProxyResource(encrypted_buffer.resource,
                                            encrypted_buffer.handle,
                                            encrypted_buffer.size);
+    PP_EncryptedBlockInfo block_info;
+    if (!DeserializeBlockInfo(serialized_block_info, &block_info))
+      return;
     CallWhileUnlocked(ppp_decryptor_impl_->Decrypt,
                       instance,
                       plugin_resource,
-                      request_id);
+                      const_cast<const PP_EncryptedBlockInfo*>(&block_info));

[xhwang, 2012/08/20 22:19:31]

Do you need this const cast?

[Tom Finegan, 2012/08/20 22:50:03]

Yeah, clang refuses to compile without it:

../../ppapi/proxy/ppp_content_decryptor_private_proxy.cc:321:5: error: no
matching function for call to 'CallWhileUnlocked'
    CallWhileUnlocked(ppp_decryptor_impl_->Decrypt,
    ^~~~~~~~~~~~~~~~~
../../ppapi/shared_impl/proxy_lock.h:103:12: note: candidate template ignored:
deduced conflicting types for parameter 'P3' ('const PP_EncryptedBlockInfo *'
vs. 'PP_EncryptedBlockInfo *')
ReturnType CallWhileUnlocked(ReturnType (*function)(P1, P2, P3),

[dmichael (off chromium), 2012/08/21 17:37:08]

Oops, yeah, we could also improve the CallWhileUnlocked templates (in
ppapi/shared_impl/proxy_lock.h") to handle this case. But this way is certainly
simpler. Adding const with const_cast is always safe.

   }
 }
 
 void PPP_ContentDecryptor_Private_Proxy::OnMsgDecryptAndDecode(
     PP_Instance instance,
-    const HostResource& encrypted_block,
-    int32_t request_id) {
+    const PPPDecryptor_Buffer& encrypted_buffer,
+    const std::string& serialized_block_info) {
   if (ppp_decryptor_impl_) {
     PP_Resource plugin_resource =
-        PluginGlobals::Get()->plugin_resource_tracker()->
-            PluginResourceForHostResource(encrypted_block);
+        PPB_Buffer_Proxy::AddProxyResource(encrypted_buffer.resource,
+                                           encrypted_buffer.handle,
+                                           encrypted_buffer.size);
+    PP_EncryptedBlockInfo block_info;
+    if (!DeserializeBlockInfo(serialized_block_info, &block_info))
+      return;
     CallWhileUnlocked(ppp_decryptor_impl_->DecryptAndDecode,
                       instance,
                       plugin_resource,
-                      request_id);
+                      const_cast<const PP_EncryptedBlockInfo*>(&block_info));
   }
 }