diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 07:31:44 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 07:31:44 +0000 |
| commit | 1dfb8befd5916a9bc6c6d6b16e897172930b9a8b (patch) | |
| tree | 9acc010228a8c6a2c37a28fd797214b88991eaa6 /content/browser/renderer_host/render_process_host_impl.cc | |
| parent | f3b55cea740c629621d9258400cc7d2d5a1a7eb1 (diff) | |
| download | chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.zip chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.tar.gz chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.tar.bz2 | |
Switch Linux Aura ports over to POSIX SHM instead of legacy SYSV SHM.
BUG=147622
R=jln@chromium.org, piman@chromium.org, skaslev@chromium.org
Review URL: https://codereview.chromium.org/13529027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_process_host_impl.cc')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index aee9d2d..fb974f7 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1047,7 +1047,7 @@ TransportDIB* RenderProcessHostImpl::MapTransportDIB( STANDARD_RIGHTS_REQUIRED | FILE_MAP_READ | FILE_MAP_WRITE, FALSE, 0); return TransportDIB::Map(section); -#elif defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#elif defined(TOOLKIT_GTK) return TransportDIB::Map(dib_id.shmkey); #elif defined(OS_ANDROID) return TransportDIB::Map(dib_id); @@ -1087,7 +1087,7 @@ TransportDIB* RenderProcessHostImpl::GetTransportDIB( } } -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#if defined(TOOLKIT_GTK) smallest_iterator->second->Detach(); #else delete smallest_iterator->second; @@ -1101,7 +1101,7 @@ TransportDIB* RenderProcessHostImpl::GetTransportDIB( } void RenderProcessHostImpl::ClearTransportDIBCache() { -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#if defined(TOOLKIT_GTK) std::map<TransportDIB::Id, TransportDIB*>::const_iterator dib = cached_dibs_.begin(); for (; dib != cached_dibs_.end(); ++dib) |