Modify the PPAPI CDM interface to pass more info.

ppapi/proxy/ppb_instance_proxy.h

Index: ppapi/proxy/ppb_instance_proxy.h
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index f7d2905fb65d9b26f1df7a4daa8adb8b03fc5a60..f4fd54d391c8b1e789b49927219255be4f107ca6 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -21,6 +21,8 @@
 #undef PostMessage
 #endif
 
+struct PP_DecryptedBlockInfo;

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

Should I include pp_content_decryptor.h up above instead of forward declaring
this?

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

The rule is always forward declare if you can. So this is good.

+
 namespace ppapi {
 namespace proxy {
 
@@ -134,13 +136,13 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                         int32_t system_code) OVERRIDE;
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
-                            int32_t request_id) OVERRIDE;
+                            const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DeliverFrame(PP_Instance instance,
                             PP_Resource decrypted_frame,
-                            int32_t request_id) OVERRIDE;
+                            const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DeliverSamples(PP_Instance instance,
                               PP_Resource decrypted_samples,
-                              int32_t request_id) OVERRIDE;
+                              const PP_DecryptedBlockInfo* block_info) OVERRIDE;
 #endif  // !defined(OS_NACL)
 
   static const ApiID kApiID = API_ID_PPB_INSTANCE;
@@ -233,13 +235,14 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                                  int32_t system_code);
   virtual void OnHostMsgDeliverBlock(PP_Instance instance,
                                      PP_Resource decrypted_block,
-                                     int32_t request_id);
+                                     const std::string& serialized_block_info);
   virtual void OnHostMsgDeliverFrame(PP_Instance instance,
                                      PP_Resource decrypted_frame,
-                                     int32_t request_id);
-  virtual void OnHostMsgDeliverSamples(PP_Instance instance,
-                                       PP_Resource decrypted_samples,
-                                       int32_t request_id);
+                                     const std::string& serialized_block_info);
+  virtual void OnHostMsgDeliverSamples(
+      PP_Instance instance,
+      PP_Resource decrypted_samples,
+      const std::string& serialized_block_info);
 #endif  // !defined(OS_NACL)
 
   // Host -> Plugin message handlers.