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 177 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 the |mime_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,
+  virtual Status GenerateKeyRequest(const char* mime_type,

[ddorwin, 2012/10/26 18:37:06]

I notice that we don't pass key_system in GKR(). That might be an issue. Really,
we should pass it in CreateCdmInstance(), but that must come through PPAPI as
GKR(). Would you prefer to do that in this CL or another?

[Tom Finegan, 2012/10/26 22:51:33]

Done.

+                                    int mime_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,
@@ skipping 230 matching lines @@
   virtual Buffer* buffer() = 0;
 
  protected:
   AudioFrames() {}
   virtual ~AudioFrames() {}
 };
 
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_