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

Unified Diff: content/renderer/pepper/pepper_video_source_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
« no previous file with comments | « content/renderer/pepper/pepper_platform_image_2d_impl.cc ('k') | content/renderer/render_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_video_source_host.cc
===================================================================
--- content/renderer/pepper/pepper_video_source_host.cc (revision 200710)
+++ content/renderer/pepper/pepper_video_source_host.cc (working copy)
@@ -199,7 +199,13 @@
reply_context_.params.set_result(PP_OK);
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(TOOLKIT_GTK)
+ // For GTK, we pass the SysV shared memory key in the message.
+ PpapiPluginMsg_VideoSource_GetFrameReply reply_msg(host_resource,
+ image_desc,
+ image_handle.fd,
+ timestamp);
+#elif defined(OS_POSIX) || defined(OS_WIN)
ppapi::proxy::SerializedHandle serialized_handle;
PpapiPluginMsg_VideoSource_GetFrameReply reply_msg(host_resource,
image_desc,
@@ -207,12 +213,6 @@
timestamp);
serialized_handle.set_shmem(image_handle, byte_count);
reply_context_.params.AppendHandle(serialized_handle);
-#elif defined(OS_LINUX)
- // For Linux, we pass the SysV shared memory key in the message.
- PpapiPluginMsg_VideoSource_GetFrameReply reply_msg(host_resource,
- image_desc,
- image_handle.fd,
- timestamp);
#else
// Not supported on other platforms.
// This is a stub reply_msg to not break the build.
« no previous file with comments | « content/renderer/pepper/pepper_platform_image_2d_impl.cc ('k') | content/renderer/render_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698