Allow null buffer resources to be returned through the PPB_ContentDecryptor_Private proxy.

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 e44aaff0b717213caff60f96426dee5fb0c0dccd..ebab96ae72094b567518272a474ec2a61fdab0d2 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
@@ -620,6 +621,8 @@ void CdmWrapper::DeliverBlock(int32_t result,
                               const cdm::Status& status,
                               const LinkedDecryptedBlock& decrypted_block,
                               const PP_DecryptTrackingInfo& tracking_info) {
+  DVLOG(2) << "DeliverBlock() - status " << status;

[Tom Finegan, 2012/10/11 23:57:56]

This is going to cause link failures on windows builds without adding a base
dependency in gyp.

[xhwang, 2012/10/12 00:06:44]

Yeah, I think we are trying to remove dependency on base/

[ddorwin, 2012/10/12 00:21:16]

Done.

[ddorwin, 2012/10/12 00:21:16]

Done.

+
   PP_DCHECK(result == PP_OK);
   PP_DecryptedBlockInfo decrypted_block_info;
   decrypted_block_info.tracking_info = tracking_info;
@@ -643,7 +646,7 @@ void CdmWrapper::DeliverBlock(int32_t result,
 
   const pp::Buffer_Dev& buffer =
       decrypted_block.get() && decrypted_block->buffer() ?
-      static_cast<PpbBuffer*>(decrypted_block->buffer())->buffer_dev() :
+          static_cast<PpbBuffer*>(decrypted_block->buffer())->buffer_dev() :
           pp::Buffer_Dev();
 
   pp::ContentDecryptor_Private::DeliverBlock(buffer, decrypted_block_info);
@@ -654,6 +657,7 @@ void CdmWrapper::DeliverFrame(
     const cdm::Status& status,
     const LinkedVideoFrame& video_frame,
     const PP_DecryptTrackingInfo& tracking_info) {
+  DVLOG(2) << "DeliverFrame() - status " << status;

[Tom Finegan, 2012/10/11 23:57:56]

Ditto.

[ddorwin, 2012/10/12 00:21:16]

Done.

   PP_DCHECK(result == PP_OK);
   PP_DecryptedFrameInfo decrypted_frame_info;
   decrypted_frame_info.tracking_info = tracking_info;