Chromium Code Reviews| Index: webkit/media/crypto/ppapi_decryptor.cc |
| diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc |
| index b4fa1595b3ba62dc46dbcf72e95d76bc555fc149..75e4d543e92bf8b4ae01f882e5dd3f5f5192543a 100644 |
| --- a/webkit/media/crypto/ppapi_decryptor.cc |
| +++ b/webkit/media/crypto/ppapi_decryptor.cc |
| @@ -105,6 +105,7 @@ void PpapiDecryptor::Decrypt( |
| } |
| void PpapiDecryptor::CancelDecrypt() { |
| + DVLOG(1) << "CancelDecrypt()"; |
| // TODO(xhwang): Implement CancelDecrypt() in PluginInstance and call it here. |
| } |
| @@ -125,12 +126,15 @@ void PpapiDecryptor::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( |