Modify the PPAPI CDM interface to pass more info.

ppapi/proxy/ppb_instance_proxy.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_completion_callback_factory.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/ppb_instance_shared.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 // Windows headers interfere with this file.
 #ifdef PostMessage
 #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 {
 
 class SerializedVarReceiveInput;
 class SerializedVarOutParam;
 class SerializedVarReturnValue;
 
 class PPB_Instance_Proxy : public InterfaceProxy,
                            public PPB_Instance_Shared {
  public:
@@ skipping 93 matching lines @@
                           PP_Var session_id,
                           PP_Resource message,
                           PP_Var default_url) OVERRIDE;
   virtual void KeyError(PP_Instance instance,
                         PP_Var key_system,
                         PP_Var session_id,
                         int32_t media_error,
                         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;
 
  private:
   // Plugin -> Host message handlers.
   void OnHostMsgGetWindowObject(PP_Instance instance,
                                 SerializedVarReturnValue result);
   void OnHostMsgGetOwnerElementObject(PP_Instance instance,
                                       SerializedVarReturnValue result);
@@ skipping 72 matching lines @@
                                    SerializedVarReceiveInput session_id,
                                    PP_Resource message,
                                    SerializedVarReceiveInput default_url);
   virtual void OnHostMsgKeyError(PP_Instance instance,
                                  SerializedVarReceiveInput key_system,
                                  SerializedVarReceiveInput session_id,
                                  int32_t media_error,
                                  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.
   void OnPluginMsgMouseLockComplete(PP_Instance instance, int32_t result);
 
   void MouseLockCompleteInHost(int32_t result, PP_Instance instance);
 
   ProxyCompletionCallbackFactory<PPB_Instance_Proxy> callback_factory_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_