| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_process_host_impl.cc (revision 192629)
|
| +++ content/browser/renderer_host/render_process_host_impl.cc (working copy)
|
| @@ -1007,7 +1007,7 @@
|
| 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);
|
| @@ -1047,7 +1047,7 @@
|
| }
|
| }
|
|
|
| -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA))
|
| +#if defined(TOOLKIT_GTK)
|
| smallest_iterator->second->Detach();
|
| #else
|
| delete smallest_iterator->second;
|
| @@ -1061,7 +1061,7 @@
|
| }
|
|
|
| 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)
|
|
|