diff options
| author | jhorwich@chromium.org <jhorwich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 00:16:35 +0000 |
|---|---|---|
| committer | jhorwich@chromium.org <jhorwich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 00:16:35 +0000 |
| commit | b3dc82b6fd757ca2314990afcad0c4650c43845e (patch) | |
| tree | 94e7fea5d19cbdda85cb58aa7406bd1fa1ef6fdf /webkit | |
| parent | 0574acb8af2e1cb78cc5797a90e92a0f7bbb2e7a (diff) | |
| download | chromium_src-b3dc82b6fd757ca2314990afcad0c4650c43845e.zip chromium_src-b3dc82b6fd757ca2314990afcad0c4650c43845e.tar.gz chromium_src-b3dc82b6fd757ca2314990afcad0c4650c43845e.tar.bz2 | |
Support for unsandboxed out-of-process pepper.
Breaking apart changes in http://codereview.chromium.org/8041002/ to only
include the infrastructure portion, as well as merging to account for moving
PepperPluginInfo into content/public/common/pepper_plugin_info.*
BUG=none
TEST=Manual, set is_sandboxed to false in chrome_content_client and observe
Review URL: http://codereview.chromium.org/8477007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/webplugininfo.cc | 9 | ||||
| -rw-r--r-- | webkit/plugins/webplugininfo.h | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/webkit/plugins/webplugininfo.cc b/webkit/plugins/webplugininfo.cc index 031dd40..bfd473c 100644 --- a/webkit/plugins/webplugininfo.cc +++ b/webkit/plugins/webplugininfo.cc @@ -60,7 +60,14 @@ WebPluginInfo::WebPluginInfo(const string16& fake_name, bool IsPepperPlugin(const WebPluginInfo& plugin) { return ((plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS ) || - plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS); + (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) || + (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED)); +} + +bool IsOutOfProcessPlugin(const WebPluginInfo& plugin) { + return ((plugin.type == WebPluginInfo::PLUGIN_TYPE_NPAPI) || + (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) || + (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED)); } } // namespace webkit diff --git a/webkit/plugins/webplugininfo.h b/webkit/plugins/webplugininfo.h index b7bb4d3..bb633f8e 100644 --- a/webkit/plugins/webplugininfo.h +++ b/webkit/plugins/webplugininfo.h @@ -41,7 +41,8 @@ struct WebPluginInfo { enum PluginType { PLUGIN_TYPE_NPAPI, PLUGIN_TYPE_PEPPER_IN_PROCESS, - PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS + PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS, + PLUGIN_TYPE_PEPPER_UNSANDBOXED }; WebPluginInfo(); @@ -77,6 +78,8 @@ struct WebPluginInfo { // Checks whether a plugin is a Pepper plugin, enabled or disabled. bool IsPepperPlugin(const WebPluginInfo& plugin); +bool IsOutOfProcessPlugin(const WebPluginInfo& plugin); + } // namespace webkit #endif // WEBKIT_PLUGINS_WEBPLUGININFO_H_ |