Call CDMWrapper from PpapiDecryptor.

ppapi/c/dev/ppb_content_decryptor_dev.h

Index: ppapi/c/dev/ppb_content_decryptor_dev.h
diff --git a/ppapi/c/dev/ppb_content_decryptor_dev.h b/ppapi/c/dev/ppb_content_decryptor_dev.h
index 2e7a82e305979d12f8a94affc5b25491d134b550..cf644e473905ee6c60bc78bb30da873c8f4a4e03 100644
--- a/ppapi/c/dev/ppb_content_decryptor_dev.h
+++ b/ppapi/c/dev/ppb_content_decryptor_dev.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppb_content_decryptor_dev.idl modified Mon Jul 16 17:58:07 2012. */
+/* From dev/ppb_content_decryptor_dev.idl modified Tue Jul 31 09:12:00 2012. */
 
 #ifndef PPAPI_C_DEV_PPB_CONTENT_DECRYPTOR_DEV_H_
 #define PPAPI_C_DEV_PPB_CONTENT_DECRYPTOR_DEV_H_
@@ -26,11 +26,11 @@
  * interface.
  */
 
+
 /**
  * @addtogroup Interfaces
  * @{
  */
-
 /**
  * <code>PPB_ContentDecryptor_Dev</code> structure contains the function
  * pointers the browser may implement to support plugins implementing the
@@ -41,18 +41,18 @@ struct PPB_ContentDecryptor_Dev_0_1 {
    * A key or license is needed to decrypt media data.
    */
   void (*NeedKey)(PP_Instance instance,
-                  struct PP_Var key_system,  /* String. */
-                  struct PP_Var session_id,  /* String. */
-                  PP_Resource init_data);    /* PPB_Buffer. */
-
+                  struct PP_Var key_system,
+                  struct PP_Var session_id,
+                  PP_Resource init_data);
+  /* PPB_Buffer. */
   /**
    * A key has been added as the result of a call to the <code>AddKey()</code>
    * method on the <code>PPP_ContentDecryptor_Dev</code> interface.
    */
   void (*KeyAdded)(PP_Instance instance,
-                   struct PP_Var key_system,   /* String. */
-                   struct PP_Var session_id);  /* String. */
-
+                   struct PP_Var key_system,
+                   struct PP_Var session_id);
+  /* String. */
   /**
    * A message or request has been generated by or for key_system. For example,
    * a key request has been generated as the result of call to the
@@ -63,53 +63,50 @@ struct PPB_ContentDecryptor_Dev_0_1 {
    * <code>AddKey()</code> calls.
    */
   void (*KeyMessage)(PP_Instance instance,
-                     struct PP_Var key_system,    /* String. */
-                     struct PP_Var session_id,    /* String. */
-                     PP_Resource message,         /* PPB_Buffer. */
-                     struct PP_Var default_url);  /* String. */
-
+                     struct PP_Var key_system,
+                     struct PP_Var session_id,
+                     PP_Resource message,
+                     struct PP_Var default_url);
+  /* String. */
   /**
    * An error occured in a <code>PPP_ContentDecryptor_Dev</code> method,
    * or within the plugin implementing the interface.
    */
   void (*KeyError)(PP_Instance instance,
-                   struct PP_Var key_system,  /* String. */
-                   struct PP_Var session_id,  /* String. */
+                   struct PP_Var key_system,
+                   struct PP_Var session_id,
                    uint16_t media_error,
                    uint16_t system_error);
-
   /**
    * Called after the <code>Decrypt</code> method on the
    * <code>PPP_ContentDecryptor_Dev</code> interface completes to
    * deliver decrypted_block to the media stack.
    */
   void (*DeliverBlock)(PP_Instance instance,
-                       PP_Resource decrypted_block,  /* PPB_Buffer. */
-                       struct PP_CompletionCallback callback);
-
+                       PP_Resource decrypted_block,
+                       uint32_t id);
   /**
    * Called after the <code>DecryptAndDecode</code> method on the
    * <code>PPP_ContentDecryptor_Dev</code> interface completes to
    * deliver decrypted_frame to the media stack.
    */
   void (*DeliverFrame)(PP_Instance instance,
-                       PP_Resource decrypted_frame,  /* PPB_Buffer. */
+                       PP_Resource decrypted_frame,
                        struct PP_CompletionCallback callback);
-
   /**
    * Called after the <code>DecryptAndDecode</code> method on the
    * <code>PPP_ContentDecryptor_Dev</code> interface completes to
    * deliver decrypted_samples to the media stack.
    */
   void (*DeliverSamples)(PP_Instance instance,
-                         PP_Resource decrypted_samples,  /* PPB_Buffer. */
+                         PP_Resource decrypted_samples,
                          struct PP_CompletionCallback callback);
 };
 
 typedef struct PPB_ContentDecryptor_Dev_0_1 PPB_ContentDecryptor_Dev;
-
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_DEV_PPB_CONTENT_DECRYPTOR_DEV_H_ */
+