Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 10545036: Add PPAPI decryptor interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add Decrypt/DecryptAndDecode Created 8 years, 6 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.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index ffd184b2accf4112d7a2c6104e26e7f51a90dcd2..11364279592a5f6ced228dbdbe8986eedbcfbbf1 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -17,6 +17,7 @@
#include "base/string16.h"
#include "googleurl/src/gurl.h"
#include "ppapi/c/dev/pp_cursor_type_dev.h"
+#include "ppapi/c/dev/ppp_content_decryption_module_dev.h"
#include "ppapi/c/dev/ppp_printing_dev.h"
#include "ppapi/c/dev/ppp_find_dev.h"
#include "ppapi/c/dev/ppp_selection_dev.h"
@@ -237,6 +238,14 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
void Graphics3DContextLost();
+ bool AddKey(PP_Resource key);
ddorwin 2012/06/06 22:16:20 I think these parameters should be standard Chromi
Tom Finegan 2012/06/07 00:50:50 I assumed PP_Resource was fine-- there are PluginI
ddorwin 2012/06/07 18:51:26 Those are all for the PPB_Instance implementation.
+ bool Decrypt(PP_Resource encypted_block,
+ PP_Resource decrypted_block,
+ PP_CompletionCallback callback);
+ bool DecryptAndDecode(PP_Resource encypted_block,
+ PP_Resource decrypted_frame,
+ PP_CompletionCallback callback);
+
// There are 2 implementations of the fullscreen interface
// PPB_FlashFullscreen is used by Pepper Flash.
// PPB_Fullscreen is intended for other applications including NaCl.
@@ -411,6 +420,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
PluginModule* module,
::ppapi::PPP_Instance_Combined* instance_interface);
+ bool LoadContentDecryptionModuleInterface();
bool LoadFindInterface();
bool LoadInputEventInterface();
bool LoadMessagingInterface();
@@ -533,6 +543,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
ResourceCreationImpl resource_creation_;
// The plugin-provided interfaces.
+ const PPP_ContentDecryptionModule_Dev* plugin_decryption_interface_;
const PPP_Find_Dev* plugin_find_interface_;
const PPP_Messaging* plugin_messaging_interface_;
const PPP_MouseLock* plugin_mouse_lock_interface_;

Powered by Google App Engine
This is Rietveld 408576698