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

Unified Diff: ppapi/proxy/ppb_instance_proxy.cc

Issue 6625045: Prevent Pepper plugin reentrncy for synchronous messages. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « ppapi/proxy/host_dispatcher.cc ('k') | ppapi/proxy/ppb_var_deprecated_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_instance_proxy.cc
===================================================================
--- ppapi/proxy/ppb_instance_proxy.cc (revision 77850)
+++ ppapi/proxy/ppb_instance_proxy.cc (working copy)
@@ -6,6 +6,7 @@
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_instance.h"
+#include "ppapi/proxy/host_dispatcher.h"
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/plugin_resource.h"
#include "ppapi/proxy/plugin_resource_tracker.h"
@@ -167,6 +168,11 @@
SerializedVarReceiveInput script,
SerializedVarOutParam out_exception,
SerializedVarReturnValue result) {
+ if (dispatcher()->IsPlugin())
+ NOTREACHED();
+ else
+ static_cast<HostDispatcher*>(dispatcher())->set_allow_plugin_reentrancy();
+
result.Return(dispatcher(), ppb_instance_target()->ExecuteScript(
instance,
script.Get(dispatcher()),
« no previous file with comments | « ppapi/proxy/host_dispatcher.cc ('k') | ppapi/proxy/ppb_var_deprecated_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698