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

Unified Diff: content/public/common/pepper_plugin_info.h

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.h ('k') | content/public/common/pepper_plugin_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/pepper_plugin_info.h
===================================================================
--- content/public/common/pepper_plugin_info.h (revision 213561)
+++ content/public/common/pepper_plugin_info.h (working copy)
@@ -11,11 +11,25 @@
#include "base/files/file_path.h"
#include "content/common/content_export.h"
#include "content/public/common/webplugininfo.h"
-#include "webkit/plugins/ppapi/plugin_module.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/ppb.h"
namespace content {
struct CONTENT_EXPORT PepperPluginInfo {
+ typedef const void* (*GetInterfaceFunc)(const char*);
+ typedef int (*PPP_InitializeModuleFunc)(PP_Module, PPB_GetInterface);
+ typedef void (*PPP_ShutdownModuleFunc)();
+
+ struct EntryPoints {
+ // This structure is POD, with the constructor initializing to NULL.
+ CONTENT_EXPORT EntryPoints();
+
+ GetInterfaceFunc get_interface;
+ PPP_InitializeModuleFunc initialize_module;
+ PPP_ShutdownModuleFunc shutdown_module; // Optional, may be NULL.
+ };
+
PepperPluginInfo();
~PepperPluginInfo();
@@ -42,7 +56,7 @@
// When is_internal is set, this contains the function pointers to the
// entry points for the internal plugins.
- webkit::ppapi::PluginModule::EntryPoints internal_entry_points;
+ EntryPoints internal_entry_points;
// Permission bits from ppapi::Permission.
uint32 permissions;
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.h ('k') | content/public/common/pepper_plugin_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698