Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

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 {
-  M34 = 0.10
+  M34 = 0.11
 };
 
 /**
  * <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 {
   /**
    * Initialize for the specified key system.
    *
    * @param[in] key_system A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the name of the key system.
    */
   void Initialize(
       [in] PP_Instance instance,
       [in] PP_Var key_system);
 
   /**
-   * Creates a session. <code>type</code> contains the MIME type of
+   * Creates a session. <code>content_type</code> contains the MIME type of
    * <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 the session ID used in
-   * other methods on this interface. The session ID must be provided to the
-   * browser by the CDM via <code>SessionCreated()</code> on the
+   * 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.
    *
    * @param[in] session_id A reference for the session for which a session
    * should be generated.
    *
-   * @param[in] type A <code>PP_Var</code> of type
+   * @param[in] content_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.
    */
   void CreateSession(
       [in] PP_Instance instance,
       [in] uint32_t session_id,
-      [in] PP_Var type,
+      [in] PP_Var content_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] session_id A reference for the session for which a session
+   * should 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 session_id,
+      [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
    * <code>SessionReady()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface, and the browser
    * must notify the web application.
@@ skipping 144 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);
 };