| Index: webkit/plugins/ppapi/plugin_module.h
|
| diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h
|
| index d9d78ba19ed55525723d8c41bd764df825212c3d..827546faccda02123164bac6ab45c337209844cd 100644
|
| --- a/webkit/plugins/ppapi/plugin_module.h
|
| +++ b/webkit/plugins/ppapi/plugin_module.h
|
| @@ -21,6 +21,7 @@
|
| #include "ppapi/c/pp_module.h"
|
| #include "ppapi/c/ppb.h"
|
| #include "ppapi/c/ppb_core.h"
|
| +#include "ppapi/shared_impl/ppapi_permissions.h"
|
| #include "webkit/plugins/ppapi/plugin_delegate.h"
|
| #include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| @@ -70,7 +71,8 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
| // tracks which modules are alive.
|
| PluginModule(const std::string& name,
|
| const FilePath& path,
|
| - PluginDelegate::ModuleLifetime* lifetime_delegate);
|
| + PluginDelegate::ModuleLifetime* lifetime_delegate,
|
| + const ::ppapi::PpapiPermissions& perms);
|
|
|
| ~PluginModule();
|
|
|
| @@ -105,6 +107,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
|
|
| const std::string& name() const { return name_; }
|
| const FilePath& path() const { return path_; }
|
| + const ::ppapi::PpapiPermissions permissions() const { return permissions_; }
|
|
|
| PluginInstance* CreateInstance(PluginDelegate* delegate);
|
|
|
| @@ -197,6 +200,8 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
|
| const std::string name_;
|
| const FilePath path_;
|
|
|
| + ::ppapi::PpapiPermissions permissions_;
|
| +
|
| // Non-owning pointers to all instances associated with this module. When
|
| // there are no more instances, this object should be deleted.
|
| PluginInstanceSet instances_;
|
|
|