diff options
Diffstat (limited to 'webkit/plugins/ppapi/plugin_module.h')
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h index e462f3a..1ade5a6 100644 --- a/webkit/plugins/ppapi/plugin_module.h +++ b/webkit/plugins/ppapi/plugin_module.h @@ -145,8 +145,9 @@ class PluginModule : public base::RefCounted<PluginModule>, PP_Bool (*reserve)(PP_Module, PP_Instance)); bool ReserveInstanceID(PP_Instance instance); - void SetBroker(scoped_refptr<PluginDelegate::PpapiBroker> broker); - scoped_refptr<PluginDelegate::PpapiBroker> GetBroker(); + // These should only be called from the main thread. + void SetBroker(PluginDelegate::PpapiBroker* broker); + PluginDelegate::PpapiBroker* GetBroker(); private: // Calls the InitializeModule entrypoint. The entrypoint must have been @@ -170,8 +171,9 @@ class PluginModule : public base::RefCounted<PluginModule>, // entry_points_ aren't valid. scoped_ptr<PluginDelegate::OutOfProcessProxy> out_of_process_proxy_; - // Trusted broker for this plugin module. - scoped_refptr<PluginDelegate::PpapiBroker> broker_; + // Non-owning pointer to the broker for this plugin module, if one exists. + // It is populated and cleared in the main thread. + PluginDelegate::PpapiBroker* broker_; // Holds a reference to the base::NativeLibrary handle if this PluginModule // instance wraps functions loaded from a library. Can be NULL. If |