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

Unified Diff: content/public/test/mock_render_process_host.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, 8 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
Index: content/public/test/mock_render_process_host.cc
===================================================================
--- content/public/test/mock_render_process_host.cc (revision 192603)
+++ content/public/test/mock_render_process_host.cc (working copy)
@@ -123,15 +123,15 @@
DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(),
&duped, 0, TRUE, DUPLICATE_SAME_ACCESS);
transport_dib_ = TransportDIB::Map(duped);
-#elif defined(OS_MACOSX)
- // On Mac, TransportDIBs are always created in the browser, so we cannot map
- // one from a dib_id.
- transport_dib_ = TransportDIB::Create(100 * 100 * 4, 0);
+#elif defined(TOOLKIT_GTK)
+ transport_dib_ = TransportDIB::Map(dib_id.shmkey);
#elif defined(OS_ANDROID)
// On Android, Handles and Ids are the same underlying type.
transport_dib_ = TransportDIB::Map(dib_id);
-#elif defined(OS_POSIX)
- transport_dib_ = TransportDIB::Map(dib_id.shmkey);
+#else
+ // On POSIX, TransportDIBs are always created in the browser, so we cannot map
+ // one from a dib_id.
+ transport_dib_ = TransportDIB::Create(100 * 100 * 4, 0);
#endif
return transport_dib_;

Powered by Google App Engine
This is Rietveld 408576698