webkit/plugins/ppapi/ppapi_plugin_instance.cc - Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest().

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/plugins/ppapi/ppapi_plugin_instance.cc

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased and addressed TODOs related to integration of this CL. Created 8 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc

diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc

index cd78ea8db33873f5b3880ad0c07ca198c5f09fc2..0b858c61cfbbecdd156491816c454d2fa4079d8b 100644

--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc

+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc

@@ -1635,10 +1635,10 @@ bool PluginInstance::GenerateKeyRequest(const std::string& key_system,

PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(

init_data.size(), init_data.data());

- // TODO(tomfinegan): Pass "type" once PPP_ContentDecryptor_Private is updated.

plugin_decryption_interface_->GenerateKeyRequest(

pp_instance(),

StringVar::StringToPPVar(key_system),

+ StringVar::StringToPPVar(type),

init_data_array);

return true;

}

« no previous file with comments | « webkit/media/crypto/ppapi/content_decryption_module.h ('k') | no next file » | no next file with comments »