Changes to support CDM_7

ppapi/api/private/ppp_content_decryptor_private.idl

 /* 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.
  */
 
 /**
  * This file defines the <code>PPP_ContentDecryptor_Private</code>
  * interface. Note: This is a special interface, only to be used for Content
  * Decryption Modules, not normal plugins.
  */
 label Chrome {
-  M36 = 0.12
+  M41 = 0.13
 };
 
 /**
  * <code>PPP_ContentDecryptor_Private</code> structure contains the function
  * pointers the decryption plugin must implement to provide services needed by
  * the browser. This interface provides the plugin side support for the Content
  * Decryption Module (CDM) for Encrypted Media Extensions:
  * http://www.w3.org/TR/encrypted-media/
  */
 interface PPP_ContentDecryptor_Private {
@@ skipping 16 matching lines @@
    *
    * @param[in] server_certificate A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing the certificate to be used.
    */
   void SetServerCertificate(
       [in] PP_Instance instance,
       [in] uint32_t promise_id,
       [in] PP_Var server_certificate);
 
   /**
    * Creates a session. <code>init_data_type</code> contains the MIME type of

[bbudge, 2014/12/19 18:22:52]

Could you add some commenting here about what 'GenerateRequest' means?

[jrummell, 2014/12/20 00:23:08]

Done.

    * <code>init_data</code>. <code>init_data</code> is a data buffer
    * containing data for use in generating the request.
    *
-   * Note: <code>CreateSession()</code> must create a web session ID and provide
-   * it to the browser via <code>SessionCreated()</code> on the
-   * <code>PPB_ContentDecryptor_Private</code> interface.
+   * Note: <code>CreateSessionAndGenerateRequest()</code> must create a web
+   * session ID and provide it to the browser via <code>SessionCreated()</code>
+   * on the <code>PPB_ContentDecryptor_Private</code> interface.
    *
    * @param[in] promise_id A reference for the promise that gets resolved or
    * rejected depending upon the success or failure when creating the session.
    *
+   * @param[in] session_type A <code>PP_SessionType</code> that indicates the
+   * type of session to be created.
+   *
    * @param[in] init_data_type A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the MIME type for init_data.
    *
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
-   *
-   * @param[in] session_type A <code>PP_SessionType</code> that indicates the
-   * type of session to be created.
    */
-  void CreateSession(
+  void CreateSessionAndGenerateRequest(
       [in] PP_Instance instance,
       [in] uint32_t promise_id,
+      [in] PP_SessionType session_type,
       [in] PP_Var init_data_type,
-      [in] PP_Var init_data,
-      [in] PP_SessionType session_type);
+      [in] PP_Var init_data);
 
   /**
    * Loads a session whose web session ID is <code>web_session_id</code>.
    *
    * Note: After the session is successfully loaded, the CDM must call
    * <code>SessionCreated()</code> with <code>web_session_id</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface.
    *
    * @param[in] promise_id A reference for the promise that gets resolved or
    * rejected depending upon the success or failure of loading the session.
    *
+   * @param[in] session_type A <code>PP_SessionType</code> that indicates the
+   * type of session to be loaded.
+   *
    * @param[in] web_session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the web session ID of the session
    * to load.
    */
   void LoadSession(
       [in] PP_Instance instance,
       [in] uint32_t promise_id,
+      [in] PP_SessionType session_type,
       [in] PP_Var web_session_id);
 
   /**
    * Provides a license or other message to the decryptor.
    *
    * When the CDM needs more information, it must call
    * <code>SessionMessage()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface, and the browser
    * must notify the web application. When the CDM has finished processing
    * <code>response</code> and needs no more information, it must call
@@ skipping 45 matching lines @@
    * <code>PP_VARTYPE_STRING</code> containing the web session ID of the session
    * to be removed.
    *
    */
   void RemoveSession(
       [in] PP_Instance instance,
       [in] uint32_t promise_id,
       [in] PP_Var web_session_id);
 
   /**
-   * Get the key IDs for keys in the session that the CDM knows are currently
-   * usable to decrypt media data.
-   *
-   * @param[in] promise_id A reference for the promise that gets resolved or
-   * rejected depending upon the success or failure of obtaining the key IDs.
-   *
-   * @param[in] web_session_id A <code>PP_Var</code> of type
-   * <code>PP_VARTYPE_STRING</code> containing the web session ID of the session
-   * to be queried.
-   *
-   */
-  void GetUsableKeyIds(
-      [in] PP_Instance instance,
-      [in] uint32_t promise_id,
-      [in] PP_Var web_session_id);
-
-  /**
    * Decrypts the block and returns the unencrypted block via
    * <code>DeliverBlock()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface. The returned block
    * contains encoded data.
    *
    * @param[in] resource A <code>PP_Resource</code> corresponding to a
    * <code>PPB_Buffer_Dev</code> resource that contains an encrypted data
    * block.
    *
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
@@ skipping 111 matching lines @@
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
    */
   void DecryptAndDecode(
       [in] PP_Instance instance,
       [in] PP_DecryptorStreamType decoder_type,
       [in] PP_Resource encrypted_buffer,
       [in] PP_EncryptedBlockInfo encrypted_block_info);
 };