Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

ppapi/c/private/ppp_content_decryptor_private.h

 /* 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.
  */
 
 /* From private/ppp_content_decryptor_private.idl,
- *   modified Wed Jan  8 16:02:29 2014.
+ *   modified Mon Feb 10 13:23:32 2014.
  */
 
 #ifndef PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 
-#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_10 \
-    "PPP_ContentDecryptor_Private;0.10"
+#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_11 \
+    "PPP_ContentDecryptor_Private;0.11"
 #define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE \
-    PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_10
+    PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_11
 
 /**
  * @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.
  */
 
 
 /**
  * @addtogroup Interfaces
  * @{
  */
 /**
  * <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/
  */
-struct PPP_ContentDecryptor_Private_0_10 {
+struct PPP_ContentDecryptor_Private_0_11 {
   /**
    * 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)(PP_Instance instance, struct 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)(PP_Instance instance,
                         uint32_t session_id,
-                        struct PP_Var type,
+                        struct PP_Var content_type,
                         struct 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)(PP_Instance instance,
+                      uint32_t session_id,
+                      struct 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 133 matching lines @@
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
    */
   void (*DecryptAndDecode)(
       PP_Instance instance,
       PP_DecryptorStreamType decoder_type,
       PP_Resource encrypted_buffer,
       const struct PP_EncryptedBlockInfo* encrypted_block_info);
 };
 
-typedef struct PPP_ContentDecryptor_Private_0_10 PPP_ContentDecryptor_Private;
+typedef struct PPP_ContentDecryptor_Private_0_11 PPP_ContentDecryptor_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_ */