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

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, 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
Index: content/public/test/mock_render_process_host.cc
===================================================================
--- content/public/test/mock_render_process_host.cc (revision 200710)
+++ content/public/test/mock_render_process_host.cc (working copy)
@@ -122,15 +122,15 @@
DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(),
&duped, 0, TRUE, DUPLICATE_SAME_ACCESS);
return 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.
- return TransportDIB::Create(100 * 100 * 4, 0);
+#elif defined(TOOLKIT_GTK)
+ return TransportDIB::Map(dib_id.shmkey);
#elif defined(OS_ANDROID)
// On Android, Handles and Ids are the same underlying type.
return TransportDIB::Map(dib_id);
-#elif defined(OS_POSIX)
- return TransportDIB::Map(dib_id.shmkey);
+#else
+ // On POSIX, TransportDIBs are always created in the browser, so we cannot map
+ // one from a dib_id.
+ return TransportDIB::Create(100 * 100 * 4, 0);
#endif
}
« no previous file with comments | « content/public/common/common_param_traits.h ('k') | content/renderer/pepper/pepper_platform_image_2d_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698