Add PPAPI decryptor interfaces.

webkit/plugins/ppapi/ppapi_plugin_instance.h

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 3195f29845af59e180133143b17d5f378f4540c2..7cf55e2101074be2e2b14e22813115f8161bb1a1 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -17,6 +18,8 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
+#include "ppapi/c/dev/ppb_content_decryption_module_dev.h"
+#include "ppapi/c/dev/ppp_content_decryption_module_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
@@ -236,6 +239,18 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
 
   void Graphics3DContextLost();
 
+  // Implementation of PPP_ContentDecryptionModule_Dev.

[ddorwin, 2012/07/13 19:19:48]

Not really an implementation of. Provides access to.

[Tom Finegan, 2012/07/17 01:11:10]

Done.

+  typedef base::Callback<void(void*, int)> CDMStatusCB;
+  bool GenerateKeyRequest(const std::string& key_system,
+                          const std::string& init_data);
+  bool AddKey(const std::string& session_id,
+              const std::string& key);
+  bool CancelKeyRequest(const std::string& session_id);
+  bool Decrypt(const std::string& encypted_block,
+               const CDMStatusCB& callback);

[ddorwin, 2012/07/13 19:19:48]

Hopefully this is some type of Base::Bind coming from PpapiDecryptor.

[Tom Finegan, 2012/07/17 01:11:10]

Ok, the typedef is really just there for the sake of being a placeholder.

+  bool DecryptAndDecode(const std::string& encypted_block,
+                        const CDMStatusCB& callback);
+
   // There are 2 implementations of the fullscreen interface
   // PPB_FlashFullscreen is used by Pepper Flash.
   // PPB_Fullscreen is intended for other applications including NaCl.
@@ -404,6 +419,32 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   virtual PP_Var GetPluginInstanceURL(
       PP_Instance instance,
       PP_URLComponents_Dev* components) OVERRIDE;
+  virtual void NeedKey(PP_Instance instance,
+                       PP_Var key_system,
+                       PP_Var session_id,
+                       PP_Resource init_data) OVERRIDE;
+  virtual void KeyAdded(PP_Instance instance,

[ddorwin, 2012/07/13 19:19:48]

As we move to an OOD for the API, I wonder if these 3 events could/should be on
the session object. I'm not exactly sure whether that would fit the pattern of
PPB Impls. Nothing to do now, but something to keep in mind.

+                        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,
+                        uint16_t media_error,
+                        uint16_t system_error) OVERRIDE;
+  virtual void DeliverBlock(PP_Instance instance,
+                            PP_Resource decrypted_block,
+                            PP_CompletionCallback callback) OVERRIDE;
+  virtual void DeliverFrame(PP_Instance instance,
+                            PP_Resource decrypted_frame,
+                            PP_CompletionCallback callback) OVERRIDE;
+  virtual void DeliverSamples(PP_Instance instance,
+                              PP_Resource decrypted_samples,
+                              PP_CompletionCallback callback) OVERRIDE;
 
   // Reset this instance as proxied. Resets cached interfaces to point to the
   // proxy and re-sends DidCreate, DidChangeView, and HandleDocumentLoad (if
@@ -420,6 +461,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
                  PluginModule* module,
                  ::ppapi::PPP_Instance_Combined* instance_interface);
 
+  bool LoadContentDecryptionModuleInterface();
   bool LoadFindInterface();
   bool LoadInputEventInterface();
   bool LoadMessagingInterface();
@@ -546,6 +588,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   scoped_ptr< ::ppapi::thunk::ResourceCreationAPI> resource_creation_;
 
   // The plugin-provided interfaces.
+  const PPP_ContentDecryptionModule_Dev* plugin_decryption_interface_;
   const PPP_Find_Dev* plugin_find_interface_;
   const PPP_InputEvent* plugin_input_event_interface_;
   const PPP_Messaging* plugin_messaging_interface_;