webkit/media/crypto/key_systems.cc - Issue 10836038: Call CDMWrapper from PpapiDecryptor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/media/crypto/key_systems.cc

Issue 10836038: Call CDMWrapper from PpapiDecryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add PP_DecryptionBuffer_Dev and update Decrypt() PPP call. Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/media/crypto/key_systems.cc

diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc

index 11a307c8ad671af4e6d7ad343f7da11ca634fb51..401d6eecd0cffa1548b83b83e2c3d4fd254b5344 100644

--- a/webkit/media/crypto/key_systems.cc

+++ b/webkit/media/crypto/key_systems.cc

@@ -48,7 +48,7 @@ supported_format_key_system_combinations[] = {

static const KeySystemPluginTypePair key_system_to_plugin_type_mapping[] = {

// TODO(xhwang): Update this with the real plugin name.

- { kExternalClearKeyKeySystem, "application/x-ppapi-example" }

+ { kExternalClearKeyKeySystem, "application/x-ppapi-content-encryption" }

};

static bool IsSupportedKeySystemWithContainerAndCodec(