Add CDM allocator interface.

webkit/media/crypto/ppapi/clear_key_cdm.h

Index: webkit/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index 44b3110e315dcc17353d302d724d80a125238f98..e25a1252970ac21c095b2d910426ebc266528ca6 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -24,13 +24,14 @@ namespace webkit_media {
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
-  ClearKeyCdm();
+  explicit ClearKeyCdm(cdm::Allocator* allocator);
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
-  virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
-                                         int init_data_size,
-                                         cdm::KeyMessage* key_request) OVERRIDE;
+  virtual cdm::Status GenerateKeyRequest(
+    const uint8_t* init_data,
+    int init_data_size,
+    cdm::KeyMessage* key_request) OVERRIDE;

[xhwang, 2012/09/13 14:35:45]

why change the format here?

[Tom Finegan, 2012/09/15 08:03:14]

The ';' was in column 81 (unless my guide is set to 79 on one of my machines...)

   virtual cdm::Status AddKey(const char* session_id,
                              int session_id_size,
                              const uint8_t* key,
@@ -101,6 +102,8 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
   // Protects the |client_| from being accessed by the |decryptor_|
   // simultaneously.
   base::Lock client_lock_;
+  // Allocates buffers using the CDM wrapper.

[xhwang, 2012/09/13 14:35:45]

The cdm should know nothing about CDM wrapper?

[ddorwin, 2012/09/13 19:47:00]

Probably self-describing anyway since the type has a very explicit purpose.

[Tom Finegan, 2012/09/15 08:03:14]

Removed comment.

+  cdm::Allocator* allocator_;

[ddorwin, 2012/09/13 19:47:00]

*const

[Tom Finegan, 2012/09/15 08:03:14]

Done.

 };
 
 }  // namespace webkit_media