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

Unified Diff: chrome/renderer/render_view.cc

Issue 3915002: Out of process Pepper (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « chrome/renderer/pepper_plugin_delegate_impl.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 65099)
+++ chrome/renderer/render_view.cc (working copy)
@@ -2534,8 +2534,15 @@
if (info.path.value() == kDefaultPluginLibraryName ||
plugin_setting == CONTENT_SETTING_ALLOW ||
host_setting == CONTENT_SETTING_ALLOW) {
- scoped_refptr<pepper::PluginModule> pepper_module(
- PepperPluginRegistry::GetInstance()->GetModule(info.path));
+ scoped_refptr<pepper::PluginModule> pepper_module;
+ if (PepperPluginRegistry::GetInstance()->RunOutOfProcessForPlugin(
+ info.path)) {
+ pepper_module =
+ pepper_delegate_.CreateOutOfProcessPepperPlugin(info.path);
+ } else {
+ pepper_module =
+ PepperPluginRegistry::GetInstance()->GetModule(info.path);
+ }
if (pepper_module) {
return CreatePepperPlugin(frame,
params,
« no previous file with comments | « chrome/renderer/pepper_plugin_delegate_impl.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698