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

webkit/media/crypto/ppapi_decryptor.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 "webkit/media/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 87 matching lines @@
                    encrypted, decrypt_cb));
     return;
   }
 
   DVLOG(1) << "Decrypt()";
   if (!cdm_plugin_->Decrypt(encrypted, decrypt_cb))
     decrypt_cb.Run(kError, NULL);
 }
 
 void PpapiDecryptor::CancelDecrypt() {
+  DVLOG(1) << "CancelDecrypt()";
   // TODO(xhwang): Implement CancelDecrypt() in PluginInstance and call it here.
 }
 
 void PpapiDecryptor::InitializeVideoDecoder(
     scoped_ptr<media::VideoDecoderConfig> config,
     const DecoderInitCB& init_cb,
     const KeyAddedCB& key_added_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&PpapiDecryptor::InitializeVideoDecoder,
                    base::Unretained(this), base::Passed(&config),
                    init_cb, key_added_cb));
     return;
   }
 
   DVLOG(1) << "InitializeVideoDecoder()";
   DCHECK(config->is_encrypted());
   DCHECK(config->IsValidConfig());
 
-  key_added_cb_ = key_added_cb;
-
   // TODO(xhwang): Enable this once PluginInstance is updated.
   // if (!cdm_plugin_->InitializeVideoDecoder(video_config.Pass(), init_cb))
-  //   init_cb.Run(false);
-  init_cb.Run(false);
+  {
+    init_cb.Run(false);
+    return;
+  }
+
+  key_added_cb_ = key_added_cb;

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

thanks!

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

Done.

+  init_cb.Run(true);
 }
 
 void PpapiDecryptor::DecryptAndDecodeVideo(
     const scoped_refptr<media::DecoderBuffer>& encrypted,
     const VideoDecodeCB& video_decode_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&PpapiDecryptor::DecryptAndDecodeVideo,
                    base::Unretained(this), encrypted, video_decode_cb));
@@ skipping 22 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system,
                                                const std::string& session_id) {
   DVLOG(1) << "Failed to call plugin.";
   client_->KeyError(key_system, session_id, kUnknownError, 0);
 }
 
 }  // namespace webkit_media