Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1826)

Unified Diff: content/renderer/render_process_impl.cc

Issue 13529027: Switch Linux Auru ports over to POSIX SHM instead of legacy SYSV SHM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/pepper_video_source_host.cc ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_process_impl.cc
===================================================================
--- content/renderer/render_process_impl.cc (revision 200710)
+++ content/renderer/render_process_impl.cc (working copy)
@@ -113,12 +113,8 @@
// Platform specific code for dealing with bitmap transport...
TransportDIB* RenderProcessImpl::CreateTransportDIB(size_t size) {
-#if defined(OS_WIN) || defined(OS_LINUX) || \
- defined(OS_OPENBSD) || defined(OS_ANDROID)
- // Windows and Linux create transport DIBs inside the renderer
- return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
-#elif defined(OS_MACOSX)
- // Mac creates transport DIBs in the browser, so we need to do a sync IPC to
+#if defined(OS_POSIX) && !defined(TOOLKIT_GTK) && !defined(OS_ANDROID)
+ // POSIX creates transport DIBs in the browser, so we need to do a sync IPC to
// get one. The TransportDIB is cached in the browser.
TransportDIB::Handle handle;
IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, true, &handle);
@@ -127,15 +123,19 @@
if (handle.fd < 0)
return NULL;
return TransportDIB::Map(handle);
-#endif // defined(OS_MACOSX)
+#else
+ // Windows, legacy GTK and Android create transport DIBs inside the
+ // renderer.
+ return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
+#endif
}
void RenderProcessImpl::FreeTransportDIB(TransportDIB* dib) {
if (!dib)
return;
-#if defined(OS_MACOSX)
- // On Mac we need to tell the browser that it can drop a reference to the
+#if defined(OS_POSIX) && !defined(TOOLKIT_GTK) && !defined(OS_ANDROID)
+ // On POSIX we need to tell the browser that it can drop a reference to the
// shared memory.
IPC::Message* msg = new ViewHostMsg_FreeTransportDIB(dib->id());
main_thread()->Send(msg);
« no previous file with comments | « content/renderer/pepper/pepper_video_source_host.cc ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698