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

webkit/media/crypto/ppapi/cdm_wrapper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cstring>
 #include <string>
 #include <vector>
 
 #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"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/core.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/pass_ref.h"
 #include "ppapi/cpp/resource.h"
@@ skipping 592 matching lines @@
   pp::ContentDecryptor_Private::KeyError(key_system_,
                                          session_id,
                                          kUnknownError,
                                          0);
 }
 
 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;
   decrypted_block_info.tracking_info.timestamp = decrypted_block->timestamp();
 
   switch (status) {
     case cdm::kSuccess:
       decrypted_block_info.result = PP_DECRYPTRESULT_SUCCESS;
       PP_DCHECK(decrypted_block.get() && decrypted_block->buffer());
       break;
     case cdm::kNoKey:
       decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_NOKEY;
       break;
     case cdm::kDecryptError:
       decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_ERROR;
       break;
     default:
       PP_DCHECK(false);
       decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_ERROR;
   }
 
   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);
 }
 
 void CdmWrapper::DeliverFrame(
     int32_t result,
     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;
 
   switch (status) {
     case cdm::kSuccess:
       PP_DCHECK(video_frame->format() == cdm::kI420 ||
                 video_frame->format() == cdm::kYv12);
       PP_DCHECK(video_frame.get() && video_frame->frame_buffer());
       decrypted_frame_info.result = PP_DECRYPTRESULT_SUCCESS;
@@ skipping 51 matching lines @@
 }  // namespace webkit_media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new webkit_media::CdmWrapperModule();
 }
 
 }  // namespace pp