Add type argument to pepper content decryptor method GenerateKeyRequest().

webkit/media/crypto/ppapi/content_decryption_module.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.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_
 
 #if defined(_MSC_VER)
 typedef unsigned char uint8_t;
 typedef unsigned int uint32_t;
@@ skipping 15 matching lines @@
 class CdmHost;
 class ContentDecryptionModule;
 }
 
 extern "C" {
 CDM_EXPORT void INITIALIZE_CDM_MODULE();
 CDM_EXPORT void DeInitializeCdmModule();
 // Caller retains ownership of arguments, which must outlive the call to
 // DestroyCdmInstance below.
 CDM_EXPORT cdm::ContentDecryptionModule* CreateCdmInstance(
-    cdm::Allocator* allocator, cdm::CdmHost* host);
+    const char* key_system,
+    int key_system_size,
+    cdm::Allocator* allocator,
+    cdm::CdmHost* host);
 CDM_EXPORT void DestroyCdmInstance(cdm::ContentDecryptionModule* instance);
 CDM_EXPORT const char* GetCdmVersion();
 }
 
 namespace cdm {
 
 class AudioFrames;
 class Buffer;
 class DecryptedBlock;
 class KeyMessage;
@@ skipping 157 matching lines @@
   kStreamTypeVideo = 1
 };
 
 // ContentDecryptionModule interface that all CDMs need to implement.
 // Note: ContentDecryptionModule implementations must use the allocator
 // provided in CreateCdmInstance() to allocate any Buffer that needs to
 // be passed back to the caller. Implementations must call Buffer::Destroy()
 // when a Buffer is created that will never be returned to the caller.
 class ContentDecryptionModule {
  public:
-  // Generates a |key_request| given the |init_data|.
+  // Generates a |key_request| given |type| and |init_data|.
   //
   // Returns kSuccess if the key request was successfully generated,
   // in which case the callee should have allocated memory for the output
   // parameters (e.g |session_id| in |key_request|) and passed the ownership
   // to the caller.
   // Returns kSessionError if any error happened, in which case the
   // |key_request| should not be used by the caller.
-  //
-  // TODO(xhwang): It's not safe to pass the ownership of the dynamically
-  // allocated memory over library boundaries. Fix it after related PPAPI change
-  // and sample CDM are landed.
-  virtual Status GenerateKeyRequest(const uint8_t* init_data,
-                                    int init_data_size,
-                                    KeyMessage* key_request) = 0;
+  virtual Status GenerateKeyRequest(
+      const char* type, int type_size,
+      const uint8_t* init_data, int init_data_size,
+      KeyMessage* key_request) = 0;
 
   // Adds the |key| to the CDM to be associated with |key_id|.
   //
   // Returns kSuccess if the key was successfully added, kSessionError
   // otherwise.
-  virtual Status AddKey(const char* session_id,
-                        int session_id_size,
-                        const uint8_t* key,
-                        int key_size,
-                        const uint8_t* key_id,
-                        int key_id_size) = 0;
+  virtual Status AddKey(const char* session_id, int session_id_size,
+                        const uint8_t* key, int key_size,
+                        const uint8_t* key_id, int key_id_size) = 0;
 
   // Cancels any pending key request made to the CDM for |session_id|.
   //
   // Returns kSuccess if all pending key requests for |session_id| were
   // successfully canceled or there was no key request to be canceled,
   // kSessionError otherwise.
-  virtual Status CancelKeyRequest(const char* session_id,
-                                  int session_id_size) = 0;
+  virtual Status CancelKeyRequest(
+      const char* session_id, int session_id_size) = 0;
 
   // Optionally populates |*msg| and indicates so in |*populated|.
   virtual void TimerExpired(KeyMessage* msg, bool* populated) = 0;
 
   // Decrypts the |encrypted_buffer|.
   //
   // Returns kSuccess if decryption succeeded, in which case the callee
   // should have filled the |decrypted_buffer| and passed the ownership of
   // |data| in |decrypted_buffer| to the caller.
   // Returns kNoKey if the CDM did not have the necessary decryption key
@@ skipping 209 matching lines @@
   virtual Buffer* buffer() = 0;
 
  protected:
   AudioFrames() {}
   virtual ~AudioFrames() {}
 };
 
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_