From 2ba8d10b3ee068b2c29550a7976b593abc0a090a Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 20 Nov 2012 03:40:57 +0000 Subject: Put pepper threading support behind a command line flag. Also, fix deadlock for sync browser messages by unlocking. BUG=161429 Review URL: https://chromiumcodereview.appspot.com/11412053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168714 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/plugin_globals.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ppapi/proxy/plugin_globals.h') diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h index 215ad63..c8bf113 100644 --- a/ppapi/proxy/plugin_globals.h +++ b/ppapi/proxy/plugin_globals.h @@ -100,6 +100,10 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { // The embedder should call this function when the command line is known. void set_command_line(const std::string& c) { command_line_ = c; } + // Sets whether threadsafety is supported. Defaults to whether the + // ENABLE_PEPPER_THREADING build flag is set. + void set_enable_threading(bool enable) { enable_threading_ = enable; } + private: // PpapiGlobals overrides. virtual bool IsPluginGlobals() const OVERRIDE; @@ -110,6 +114,8 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { PluginResourceTracker plugin_resource_tracker_; PluginVarTracker plugin_var_tracker_; scoped_refptr callback_tracker_; + + bool enable_threading_; // Indicates whether we'll use the lock. base::Lock proxy_lock_; scoped_ptr msg_loop_slot_; -- cgit v1.1