diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 06:07:47 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 06:07:47 +0000 |
| commit | 73429ca358da1cc0f93de1d4b4b8e691a4588b17 (patch) | |
| tree | 9b36891413388830ea206050a7ec30ffcc239a22 /components/nacl | |
| parent | 3d15fd89d916697d606ac6c3a87949ef68aac727 (diff) | |
| download | chromium_src-73429ca358da1cc0f93de1d4b4b8e691a4588b17.zip chromium_src-73429ca358da1cc0f93de1d4b4b8e691a4588b17.tar.gz chromium_src-73429ca358da1cc0f93de1d4b4b8e691a4588b17.tar.bz2 | |
Add RenderThread::GetShutdownEvent().
This change adds RenderThread::GetShutdownEvent() to the public content API.
This is required for code outside of content/ that wants to safely use
interfaces like SyncChannel.
BUG=
Review URL: https://codereview.chromium.org/186973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/nacl')
| -rw-r--r-- | components/nacl/renderer/ppb_nacl_private_impl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc index 237e6d9..1e64407 100644 --- a/components/nacl/renderer/ppb_nacl_private_impl.cc +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc @@ -77,8 +77,6 @@ typedef std::map<PP_Instance, nacl::TrustedPluginChannel*> base::LazyInstance<InstanceTrustedChannelMap> g_channel_map = LAZY_INSTANCE_INITIALIZER; -base::WaitableEvent* g_shutdown_event; - void HistogramEnumerate(const std::string& name, int32_t sample, int32_t boundary_value) { @@ -195,10 +193,9 @@ void LaunchSelLdr(PP_Instance instance, invalid_handle = (launch_result.trusted_ipc_channel_handle.socket.fd == -1); #endif if (!invalid_handle) { - if (g_shutdown_event == NULL) - g_shutdown_event = new base::WaitableEvent(true, false); g_channel_map.Get()[instance] = new nacl::TrustedPluginChannel( - launch_result.trusted_ipc_channel_handle, callback, g_shutdown_event); + launch_result.trusted_ipc_channel_handle, callback, + content::RenderThread::Get()->GetShutdownEvent()); } *(static_cast<NaClHandle*>(imc_handle)) = |