Add PPAPI decryptor interfaces.

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"
@@ skipping 83 matching lines @@
                                 PP_TextInput_Type type) OVERRIDE;
   virtual void UpdateCaretPosition(PP_Instance instance,
                                    const PP_Rect& caret,
                                    const PP_Rect& bounding_box) OVERRIDE;
   virtual void CancelCompositionText(PP_Instance instance) OVERRIDE;
   virtual void SelectionChanged(PP_Instance instance) OVERRIDE;
   virtual void UpdateSurroundingText(PP_Instance instance,
                                      const char* text,
                                      uint32_t caret,
                                      uint32_t anchor) OVERRIDE;
+  virtual void NeedKey(PP_Instance instance,
+                       PP_Var key_system,
+                       PP_Var session_id,
+                       PP_Var init_data) OVERRIDE;
+  virtual void KeyAdded(PP_Instance instance,
+                        PP_Var key_system,
+                        PP_Var session_id) OVERRIDE;
+  virtual void KeyMessage(PP_Instance instance,
+                          PP_Var key_system,
+                          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_error) OVERRIDE;
+  virtual void DeliverBlock(PP_Instance instance,
+                            PP_Resource decrypted_block,
+                            uint64_t request_id) OVERRIDE;
+  virtual void DeliverFrame(PP_Instance instance,
+                            PP_Resource decrypted_frame,
+                            uint64_t request_id) OVERRIDE;
+  virtual void DeliverSamples(PP_Instance instance,
+                              PP_Resource decrypted_samples,
+                              uint64_t request_id) OVERRIDE;
 
 #if !defined(OS_NACL)

[dmichael (off chromium), 2012/08/08 03:38:10]

please put your stuff inside of the #if !defined(OS_NACL)

(unless you're certain you want to support NaCl CDMs)

[Tom Finegan, 2012/08/08 19:02:15]

Done.

   virtual PP_Var ResolveRelativeToDocument(
       PP_Instance instance,
       PP_Var relative,
       PP_URLComponents_Dev* components) OVERRIDE;
   virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) OVERRIDE;
   virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance,
                                             PP_Instance target) OVERRIDE;
   virtual PP_Var GetDocumentURL(PP_Instance instance,
                                 PP_URLComponents_Dev* components) OVERRIDE;
   virtual PP_Var GetPluginInstanceURL(
@@ skipping 50 matching lines @@
   void OnHostMsgSetTextInputType(PP_Instance instance, PP_TextInput_Type type);
   void OnHostMsgUpdateCaretPosition(PP_Instance instance,
                                     const PP_Rect& caret,
                                     const PP_Rect& bounding_box);
   void OnHostMsgCancelCompositionText(PP_Instance instance);
   void OnHostMsgUpdateSurroundingText(
       PP_Instance instance,
       const std::string& text,
       uint32_t caret,
       uint32_t anchor);
+
+  virtual void OnHostMsgNeedKey(PP_Instance instance,
+                                SerializedVarReceiveInput key_system,
+                                SerializedVarReceiveInput session_id,
+                                SerializedVarReceiveInput init_data);
+  virtual void OnHostMsgKeyAdded(PP_Instance instance,
+                                 SerializedVarReceiveInput key_system,
+                                 SerializedVarReceiveInput session_id);
+  virtual void OnHostMsgKeyMessage(PP_Instance instance,
+                                   SerializedVarReceiveInput key_system,
+                                   SerializedVarReceiveInput session_id,
+                                   const ppapi::HostResource& message,
+                                   SerializedVarReceiveInput default_url);
+  virtual void OnHostMsgKeyError(PP_Instance instance,
+                                 SerializedVarReceiveInput key_system,
+                                 SerializedVarReceiveInput session_id,
+                                 int32_t media_error,
+                                 int32_t system_error);
+  virtual void OnHostMsgDeliverBlock(PP_Instance instance,
+                                     const ppapi::HostResource& decrypted_block,
+                                     uint64_t request_id);
+  virtual void OnHostMsgDeliverFrame(PP_Instance instance,
+                                     const ppapi::HostResource& decrypted_frame,
+                                     uint64_t request_id);
+  virtual void OnHostMsgDeliverSamples(
+      PP_Instance instance,
+      const ppapi::HostResource& decrypted_samples,
+      uint64_t request_id);
+
 #if !defined(OS_NACL)

[dmichael (off chromium), 2012/08/08 03:38:10]

please put your message handlers inside the:
#if !defined(OS_NACL)

[Tom Finegan, 2012/08/08 19:02:15]

Done.

   void OnHostMsgResolveRelativeToDocument(PP_Instance instance,
                                           SerializedVarReceiveInput relative,
                                           SerializedVarReturnValue result);
   void OnHostMsgDocumentCanRequest(PP_Instance instance,
                                    SerializedVarReceiveInput url,
                                    PP_Bool* result);
   void OnHostMsgDocumentCanAccessDocument(PP_Instance active,
                                           PP_Instance target,
                                           PP_Bool* result);
   void OnHostMsgGetDocumentURL(PP_Instance instance,
                                SerializedVarReturnValue result);
   void OnHostMsgGetPluginInstanceURL(PP_Instance instance,
                                      SerializedVarReturnValue result);
 #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_