Hook up CDM calls in CdmWrapper.

Updated pp::ContentDecryptor_Private methods in CdmWrapper to call into the CDM. Also updated the event firing through pp::ContentDecryptor_Private interface in CdmWrapper.

BUG=138139
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10876014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153704 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 51 insertions, 1 deletions

diff --git a/ppapi/api/private/ppp_content_decryptor_private.idl b/ppapi/api/private/ppp_content_decryptor_private.idl
index 81d353f..7207b83 100644
--- a/ppapi/api/private/ppp_content_decryptor_private.idl
+++ b/ppapi/api/private/ppp_content_decryptor_private.idl
@@ -36,6 +36,11 @@ interface PPP_ContentDecryptor_Private {
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool GenerateKeyRequest(
       [in] PP_Instance instance,
@@ -63,6 +68,11 @@ interface PPP_ContentDecryptor_Private {
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool AddKey(
       [in] PP_Instance instance,
@@ -75,6 +85,11 @@ interface PPP_ContentDecryptor_Private {
    *
    * @param[in] session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the session ID.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool CancelKeyRequest(
       [in] PP_Instance instance,
@@ -93,6 +108,11 @@ interface PPP_ContentDecryptor_Private {
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool Decrypt(
       [in] PP_Instance instance,
@@ -115,6 +135,11 @@ interface PPP_ContentDecryptor_Private {
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool DecryptAndDecode(
       [in] PP_Instance instance,
diff --git a/ppapi/c/private/ppp_content_decryptor_private.h b/ppapi/c/private/ppp_content_decryptor_private.h
index 45c8c0d..ed7227e 100644
--- a/ppapi/c/private/ppp_content_decryptor_private.h
+++ b/ppapi/c/private/ppp_content_decryptor_private.h
@@ -4,7 +4,7 @@
  */
 
 /* From private/ppp_content_decryptor_private.idl,
- *   modified Fri Aug 17 09:07:21 2012.
+ *   modified Tue Aug 28 09:32:44 2012.
  */
 
 #ifndef PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_
@@ -59,6 +59,11 @@ struct PPP_ContentDecryptor_Private_0_1 {
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool (*GenerateKeyRequest)(PP_Instance instance,
                                 struct PP_Var key_system,
@@ -84,6 +89,11 @@ struct PPP_ContentDecryptor_Private_0_1 {
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool (*AddKey)(PP_Instance instance,
                     struct PP_Var session_id,
@@ -94,6 +104,11 @@ struct PPP_ContentDecryptor_Private_0_1 {
    *
    * @param[in] session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the session ID.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool (*CancelKeyRequest)(PP_Instance instance, struct PP_Var session_id);
   /**
@@ -109,6 +124,11 @@ struct PPP_ContentDecryptor_Private_0_1 {
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool (*Decrypt)(
       PP_Instance instance,
@@ -130,6 +150,11 @@ struct PPP_ContentDecryptor_Private_0_1 {
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
+   *
+   * @return <code>PP_TRUE</code> if this call was forwarded to the CDM
+   * successfully, <code>PP_FALSE</code> otherwise. Once the call reaches the
+   * CDM, the call result/status should be reported through the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool (*DecryptAndDecode)(
       PP_Instance instance,