summaryrefslogtreecommitdiffstats
path: root/webkit/media/crypto/ppapi/clear_key_cdm.cc
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 19:40:31 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 19:40:31 +0000
commit082360418b264a5d79e272a0a9eee19d8c02f656 (patch)
tree23fabd6bb5fd3d77aadda03d182b0b0f6ec3e7f3 /webkit/media/crypto/ppapi/clear_key_cdm.cc
parente9ac43948f77b7ae198b42719105ae57c6ba5856 (diff)
downloadchromium_src-082360418b264a5d79e272a0a9eee19d8c02f656.zip
chromium_src-082360418b264a5d79e272a0a9eee19d8c02f656.tar.gz
chromium_src-082360418b264a5d79e272a0a9eee19d8c02f656.tar.bz2
Allow decrypt error to be returned in CdmWrapper::DeliverBlock().
We should allow kDecryptError be returned to the browser instead of PP_DCHECK(false) there. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/11017043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/crypto/ppapi/clear_key_cdm.cc')
-rw-r--r--webkit/media/crypto/ppapi/clear_key_cdm.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 49df915..750814e 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -236,8 +236,6 @@ cdm::Status ClearKeyCdm::Decrypt(
cdm::Status ClearKeyCdm::InitializeVideoDecoder(
const cdm::VideoDecoderConfig& video_decoder_config) {
NOTIMPLEMENTED();
- // TODO(tomfinegan): Determine the proper error to return here once there
- // are callers for this method.
return cdm::kSessionError;
}