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 835d06258a28020d9ae7612b75ed15c63a2293a9..f02054e43de06585bcd1e69593071b938ae70368 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/time.h"
 #include "media/base/decoder_buffer.h"
+#include "webkit/media/crypto/ppapi/cdm_allocator.h"
 
 static const char kClearKeyCdmVersion[] = "0.1.0.0";
 
@@ -124,10 +125,18 @@ void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
   NOTREACHED();
 }
 
-ClearKeyCdm::ClearKeyCdm() : decryptor_(&client_) {}
+ClearKeyCdm::ClearKeyCdm() : decryptor_(&client_), allocator_iface_(NULL) {}
 
 ClearKeyCdm::~ClearKeyCdm() {}
 
+bool ClearKeyCdm::Initialize(CdmAllocator* allocator) {

[ddorwin, 2012/09/04 09:53:15]

Is there a reason we can't do this in the constructor?

[Tom Finegan, 2012/09/07 00:46:36]

Nope, done. Also, I made the default constructor private. Not sure if that's OK
here, and, in the spirit of over engineering, added a NOTREACHED() to the
default constructor implementation.

+  if (!allocator) {

[ddorwin, 2012/09/04 09:53:15]

Seems like a DCHECK. And can remove return type (or add to constructor per
above).

[Tom Finegan, 2012/09/07 00:46:36]

Moved to constructor, and I put a DCHECK there.

+    return false;
+  }
+  allocator_iface_ = allocator;
+  return true;
+}
+
 cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
                                             int init_data_size,
                                             cdm::KeyMessage* key_request) {
@@ -210,8 +219,14 @@ 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->data =
+      allocator_iface_->Allocate(data_size,
+                                 &decrypted_buffer->buffer_id);
+  memcpy(reinterpret_cast<void*>(decrypted_buffer->data),

[ddorwin, 2012/09/04 09:53:15]

Copy = boo!
Maybe a TODO to make CopyDecoderBufferFrom take a target buffer so we can focus
on that separately.

[Tom Finegan, 2012/09/07 00:46:36]

TODO added.

+         buffer->GetData(),
+         data_size);
+
   decrypted_buffer->timestamp = buffer->GetTimestamp().InMicroseconds();
   return cdm::kSuccess;
 }