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

Unified Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 11140046: Add a content API to connect a Native Client module to an out-of-process PPAPI proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « webkit/plugins/ppapi/plugin_module.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/plugin_module.cc
===================================================================
--- webkit/plugins/ppapi/plugin_module.cc (revision 162270)
+++ webkit/plugins/ppapi/plugin_module.cc (working copy)
@@ -511,21 +511,16 @@
return nacl_module;
}
-void PluginModule::InitAsProxiedNaCl(
- scoped_ptr<PluginDelegate::OutOfProcessProxy> out_of_process_proxy,
- PP_Instance instance) {
- InitAsProxied(out_of_process_proxy.release());
+void PluginModule::InitAsProxiedNaCl(PluginInstance* plugin_instance) {
+ DCHECK(out_of_process_proxy_.get());
// InitAsProxied (for the trusted/out-of-process case) initializes only the
// module, and one or more instances are added later. In this case, the
// PluginInstance was already created as in-process, so we missed the proxy
// AddInstance step and must do it now.
- out_of_process_proxy_->AddInstance(instance);
+ out_of_process_proxy_->AddInstance(plugin_instance->pp_instance());
// In NaCl, we need to tell the instance to reset itself as proxied. This will
// clear cached interface pointers and send DidCreate (etc) to the plugin
// side of the proxy.
- PluginInstance* plugin_instance = host_globals->GetInstance(instance);
- if (!plugin_instance)
- return;
plugin_instance->ResetAsProxied(this);
}
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698