Add CDM allocator interface.

webkit/media/crypto/ppapi/clear_key_cdm.cc

Index: webkit/media/crypto/ppapi/clear_key_cdm.cc
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 94addb4d73bde1a4789b51767f3613e3376793bc..4aa677821b4bfe9e9cc4676937f6b7d8d1c32938 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -15,11 +15,12 @@ static const char kClearKeyCdmVersion[] = "0.1.0.0";
 
 static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
     const cdm::InputBuffer& input_buffer) {
+  // TODO(tomfinegan): Get rid of this copy.
   scoped_refptr<media::DecoderBuffer> output_buffer =
       media::DecoderBuffer::CopyFrom(input_buffer.data, input_buffer.data_size);
 
   std::vector<media::SubsampleEntry> subsamples;
-  for (uint32_t i = 0; i < input_buffer.num_subsamples; ++i) {
+  for (int32_t i = 0; i < input_buffer.num_subsamples; ++i) {
     media::SubsampleEntry subsample;
     subsample.clear_bytes = input_buffer.subsamples[i].clear_bytes;
     subsample.cypher_bytes = input_buffer.subsamples[i].cipher_bytes;
@@ -63,8 +64,8 @@ static Type* AllocateAndCopy(const Type* data, int size) {
   return copy;
 }
 
-cdm::ContentDecryptionModule* CreateCdmInstance() {
-  return new webkit_media::ClearKeyCdm();
+cdm::ContentDecryptionModule* CreateCdmInstance(cdm::Allocator* allocator) {
+  return new webkit_media::ClearKeyCdm(allocator);
 }
 
 void DestroyCdmInstance(cdm::ContentDecryptionModule* instance) {
@@ -124,7 +125,10 @@ void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
   NOTREACHED();
 }
 
-ClearKeyCdm::ClearKeyCdm() : decryptor_(&client_) {}
+ClearKeyCdm::ClearKeyCdm(cdm::Allocator* allocator)
+    : decryptor_(&client_), allocator_(allocator) {
+  DCHECK(allocator_);
+}
 
 ClearKeyCdm::~ClearKeyCdm() {}
 
@@ -140,15 +144,26 @@ cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
     return cdm::kError;
 
   DCHECK(key_request);
-  key_request->session_id = AllocateAndCopy(client_.session_id().data(),
-                                            client_.session_id().size());
-  key_request->session_id_size = client_.session_id().size();
-  key_request->message = AllocateAndCopy(client_.key_message(),
-                                             client_.key_message_length());
-  key_request->message_size = client_.key_message_length();
-  key_request->default_url = AllocateAndCopy(client_.default_url().data(),
-                                             client_.default_url().size());
-  key_request->default_url_size = client_.default_url().size();
+
+  if (!key_request->set_session_id(client_.session_id().data(),
+                                   client_.session_id().size()))
+    return cdm::kError;
+
+  // TODO(tomfinegan): Get rid of this copy.
+  if (!key_request->set_message(
+        allocator_->Allocate(client_.key_message_length())))
+    return cdm::kError;
+
+  DCHECK(key_request->message());
+  DCHECK_EQ(key_request->message()->size(), client_.key_message_length());
+  memcpy(reinterpret_cast<void*>(key_request->message()->buffer()),
+         reinterpret_cast<const void*>(client_.key_message()),
+         client_.key_message_length());
+
+  if (!key_request->set_default_url(client_.default_url().data(),
+                                    client_.default_url().size()))
+    return cdm::kError;
+
   return cdm::kSuccess;
 }
 
@@ -210,9 +225,15 @@ cdm::Status ClearKeyCdm::Decrypt(
 
   DCHECK(buffer);
   int data_size = buffer->GetDataSize();
-  decrypted_buffer->data = AllocateAndCopy(buffer->GetData(), data_size);
-  decrypted_buffer->data_size = data_size;
-  decrypted_buffer->timestamp = buffer->GetTimestamp().InMicroseconds();
+
+  if (!decrypted_buffer->set_buffer(allocator_->Allocate(data_size)))
+    return cdm::kError;
+
+  memcpy(reinterpret_cast<void*>(decrypted_buffer->buffer()->buffer()),
+         buffer->GetData(),
+         data_size);
+
+  decrypted_buffer->set_timestamp(buffer->GetTimestamp().InMicroseconds());
   return cdm::kSuccess;
 }