Fix resource leaks in CDM implementation.

webkit/media/crypto/ppapi/cdm_wrapper.cc

Index: webkit/media/crypto/ppapi/cdm_wrapper.cc
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc
index 88baa44062b74920ed0ee272db53ec8c29824e7b..d7366867450d209ff1928f20d6806b07e28aef1e 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -90,7 +90,7 @@ class CdmWrapper : public pp::Instance,
   // buffer resource, and returns it. Returns a an invalid PP_Resource with an
   // ID of 0 on failure. Upon success, the returned Buffer resource has a
   // reference count of 1.
-  PP_Resource MakeBufferResource(const uint8_t* data, uint32_t data_size);
+  pp::Resource MakeBufferResource(const uint8_t* data, uint32_t data_size);
 
   // <code>PPB_ContentDecryptor_Private</code> dispatchers. These are passed to
   // <code>callback_factory_</code> to ensure that calls into
@@ -233,7 +233,6 @@ bool CdmWrapper::Decrypt(pp::Buffer_Dev encrypted_buffer,
       status,
       output_buffer,
       encrypted_block_info.tracking_info));
-
   return true;
 }
 
@@ -243,18 +242,17 @@ bool CdmWrapper::DecryptAndDecode(
   return false;
 }
 
-PP_Resource CdmWrapper::MakeBufferResource(const uint8_t* data,
-                                           uint32_t data_size) {
+pp::Resource CdmWrapper::MakeBufferResource(const uint8_t* data,
+                                            uint32_t data_size) {
   if (!data || !data_size)
-    return 0;
+    return pp::Resource();
 
   pp::Buffer_Dev buffer(this, data_size);
   if (!buffer.data())
-    return 0;
+    return pp::Resource();
 
   memcpy(buffer.data(), data, data_size);
-
-  return buffer.detach();
+  return buffer;
 }
 
 void CdmWrapper::KeyAdded(int32_t result, const std::string& session_id) {
@@ -263,8 +261,9 @@ void CdmWrapper::KeyAdded(int32_t result, const std::string& session_id) {
 
 void CdmWrapper::KeyMessage(int32_t result,
                             cdm::KeyMessage& key_message) {
-  pp::Buffer_Dev message_buffer(MakeBufferResource(key_message.message,
-                                                   key_message.message_size));
+  pp::Buffer_Dev message_buffer(
+      MakeBufferResource(key_message.message,
+                         key_message.message_size).pp_resource());

[dmichael (off chromium), 2012/09/06 02:46:52]

Don't call pp_resource; just use the copy constructor. The C++ resource wrappers
are designed so that you can copy or pass them around safely. Going to the C
version unnecessarily just opens you up to mistakes.

[Tom Finegan, 2012/09/06 04:01:02]

Done.

   pp::ContentDecryptor_Private::KeyMessage(
       key_system_,
       std::string(key_message.session_id, key_message.session_id_size),
@@ -294,8 +293,9 @@ void CdmWrapper::DeliverBlock(int32_t result,
                               const cdm::Status& status,
                               cdm::OutputBuffer& output_buffer,
                               const PP_DecryptTrackingInfo& tracking_info) {
-  pp::Buffer_Dev decrypted_buffer(MakeBufferResource(output_buffer.data,
-                                                     output_buffer.data_size));
+  pp::Buffer_Dev decrypted_buffer(
+      MakeBufferResource(output_buffer.data,
+                         output_buffer.data_size).pp_resource());

[dmichael (off chromium), 2012/09/06 02:46:52]

ditto

[Tom Finegan, 2012/09/06 04:01:02]

Done.

 
   PP_DecryptedBlockInfo decrypted_block_info;
   decrypted_block_info.tracking_info.request_id = tracking_info.request_id;